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

[bargull@openlaszlo.org]

Author: bargull
Date: 2009-03-09 07:27:40 -0700 (Mon, 09 Mar 2009)
New Revision: 13224

Modified:
   openlaszlo/trunk/WEB-INF/lps/lfc/kernel/swf/LzLoader.lzs
Log:
Change 20090309-bargull-fGL by bargull at dell--p4--2-53 on 2009-03-09 03:20:55
    in /home/Admin/src/svn/openlaszlo/trunk
    for http://svn.openlaszlo.org/openlaszlo/trunk

Summary: fix timeout for media-content

New Features:

Bugs Fixed: LPP-7878 (SWF8: "ontimeout" not send for media-content)

Technical Reviewer: hminsky
QA Reviewer: (pending)
Doc Reviewer: (pending)

Documentation:

Release Notes:

Details:
Call unloadRequest() after performing the "already loaded"-check, because:
- for timed out load-objects LzLoadQueue.checkTimeout() sets the "timedout"-flag and calls returnData()
- if returnData() calls immediately LzLoadQueue.unloadRequest(), both the "timedout"- and "loaded"-flag are set
- in that case, the lfc-code warned that the load-object was already loaded, which is clearly wrong

    

Tests:
testcase at bugreport



Modified: openlaszlo/trunk/WEB-INF/lps/lfc/kernel/swf/LzLoader.lzs
===================================================================
--- openlaszlo/trunk/WEB-INF/lps/lfc/kernel/swf/LzLoader.lzs	2009-03-09 10:30:17 UTC (rev 13223)
+++ openlaszlo/trunk/WEB-INF/lps/lfc/kernel/swf/LzLoader.lzs	2009-03-09 14:27:40 UTC (rev 13224)
@@ -115,8 +115,6 @@
   * @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
@@ -140,17 +138,15 @@
         Debug.error("%w.returnData: unhandled loadobj %w", this, loadobj);
     }
 
-    // Ok, we have loaded this.  loadFinished changes state of loadobj
+    // Ok, we have loaded this. unloadRequest changes state of loadobj
     // from loading to loaded.
 
     // TODO [2005-08-11 ptw] If this were a multi-threaded system, we
     // would have to worry about getLoadMovie trying to reuse the
     // loadobj before we have finished with it.
 
-    // This is done in LzLoadQueue.XMLOnDataHandler now, in order
-    // to pipeline a new load request while the data copy task is happening.
+    LzLoadQueue.unloadRequest(loadobj);
 
-
     if ( ! loadobj.valid ) {
         return;
     }