[Laszlo-checkins] r10626 - openlaszlo/trunk/WEB-INF/lps/lfc/kernel/swf

[hqm@openlaszlo.org]

Author: hqm
Date: 2008-08-07 06:13:10 -0700 (Thu, 07 Aug 2008)
New Revision: 10626

Modified:
   openlaszlo/trunk/WEB-INF/lps/lfc/kernel/swf/LzLoadQueue.as
   openlaszlo/trunk/WEB-INF/lps/lfc/kernel/swf/LzLoader.lzs
Log:
Change 20080806-hqm-A by hqm at badtzmaru.home on 2008-08-06 14:22:03 EDT
    in /Users/hqm/openlaszlo/trunk4/WEB-INF/lps/lfc
    for http://svn.openlaszlo.org/openlaszlo/trunk/WEB-INF/lps/lfc

Summary: fix for swf8 LzLoadQueue

New Features:

Bugs Fixed: LPP-6748

Technical Reviewer: andre
QA Reviewer: pbr
Doc Reviewer: (pending)

Documentation:

Release Notes:

Details:
    
+ I had incorrectly removed the call to unload requests from the
"LzLoader.returnData" method, but returnData is also used by the media
loader to clean up after a request, so all media requests would fail
to decrement the openConx counter.



Tests:

test/rpc/javarpc/session-counter.lzx  ;; press increment button ten times, data should increment each time

test case in bug report

lzpix demo works again

test/lfc/data/alldata.lzx




Modified: openlaszlo/trunk/WEB-INF/lps/lfc/kernel/swf/LzLoadQueue.as
===================================================================
--- openlaszlo/trunk/WEB-INF/lps/lfc/kernel/swf/LzLoadQueue.as	2008-08-07 12:41:11 UTC (rev 10625)
+++ openlaszlo/trunk/WEB-INF/lps/lfc/kernel/swf/LzLoadQueue.as	2008-08-07 13:13:10 UTC (rev 10626)
@@ -89,6 +89,9 @@
   * LzLoadQueue!
   */
 LzLoadQueue.XMLOnDataHandler = function (src) {
+    // cancel the timeout handler
+    LzLoadQueue.unloadRequest(this);
+
     if (src == undefined) {
         if (!this.proxied) {
             Debug.warn("LzLoadQueue.XMLOnDataHandler load failed from URL %w, no data received.", this.url);
@@ -99,8 +102,6 @@
         if (this.loader.onerror.ready) {
             this.loader.onerror.sendEvent(null);
         }
-        // cancel the timeout handler
-        LzLoadQueue.unloadRequest(this);
     } else {
         // If we timed out, and this response came in late, ignore it.
         if (this.timedout) {
@@ -111,7 +112,6 @@
         // LzDataNodes.
 
         this.onload(true);
-        LzLoadQueue.loadFinished( this );
         this.loader.gotRawData(src, this);
     }
 }
@@ -165,8 +165,6 @@
   */
 LzLoadQueue.loadFinished = function( loadmc ){
     this.openConx--;
-    //Debug.write('LzLoadQueue.loadFinished', this.openConx);
-
     // Many subclasses of LzLoader seem to only call
     // LzLoadQueue.loadFinished, rather than LzLoader.returnData
     loadmc.loaded = true;

Modified: openlaszlo/trunk/WEB-INF/lps/lfc/kernel/swf/LzLoader.lzs
===================================================================
--- openlaszlo/trunk/WEB-INF/lps/lfc/kernel/swf/LzLoader.lzs	2008-08-07 12:41:11 UTC (rev 10625)
+++ openlaszlo/trunk/WEB-INF/lps/lfc/kernel/swf/LzLoader.lzs	2008-08-07 13:13:10 UTC (rev 10626)
@@ -144,6 +144,8 @@
   * @access private
   */
 function returnData ( loadobj , data ){
+    LzLoadQueue.unloadRequest(loadobj);
+
     // Check if returnData has already been called on this
     // object. This can happen if a serverless data load timed out in
     // the LFC, but eventually returned something via the