Author: hqm
Date: 2007-10-28 19:36:23 -0700 (Sun, 28 Oct 2007)
New Revision: 7038
Modified:
openlaszlo/branches/wafflecone/WEB-INF/lps/lfc/kernel/swf/LzLoadQueue.as
openlaszlo/branches/wafflecone/WEB-INF/lps/lfc/kernel/swf/LzLoader.lzs
Log:
merge from r6975 in trunk, for LPP-4099
Modified:
openlaszlo/branches/wafflecone/WEB-INF/lps/lfc/kernel/swf/LzLoadQueue.as
===================================================================
--- openlaszlo/branches/wafflecone/WEB-INF/lps/lfc/kernel/swf/LzLoadQueue.as
2007-10-29 02:32:02 UTC (rev 7037)
+++ openlaszlo/branches/wafflecone/WEB-INF/lps/lfc/kernel/swf/LzLoadQueue.as
2007-10-29 02:36:23 UTC (rev 7038)
@@ -104,6 +104,11 @@
// cancel the timeout handler
LzLoadQueue.unloadRequest(this);
} else {
+ // If we timed out, and this response came in late, ignore it.
+ if (this.timedout) {
+ return;
+ }
+
//Debug.write("LzLoadQueue.XMLOnDataHandler success", this, this.loader);
// Create a queue containing one root node, myself, and convert it and
all children to
// LzDataNodes.
Modified: openlaszlo/branches/wafflecone/WEB-INF/lps/lfc/kernel/swf/LzLoader.lzs
===================================================================
--- openlaszlo/branches/wafflecone/WEB-INF/lps/lfc/kernel/swf/LzLoader.lzs
2007-10-29 02:32:02 UTC (rev 7037)
+++ openlaszlo/branches/wafflecone/WEB-INF/lps/lfc/kernel/swf/LzLoader.lzs
2007-10-29 02:36:23 UTC (rev 7038)
@@ -144,7 +144,7 @@
// object. This can happen if a serverless data load timed out in
// the LFC, but eventually returned something via the
// LoadVars.sendAndLoad() callback.
- if (loadobj.loaded && loadobj.valid) {
+ if (loadobj.loaded && loadobj.valid && loadobj.timedout && data == null) {
if ($debug) {
Debug.warn("%w.returnData: %w already loaded",
this, loadobj);
@@ -349,6 +349,9 @@
* @access private
*/
function requestDirectXML ( o ){
+ if ($debug) {
+ LzLoader.debugLoadObj(o);
+ }
this.initializeRequestObj(o);
LzLoadQueue.enqueueRequest( o );
// We should probably be passing something other than the obj itself to
_______________________________________________
Laszlo-checkins mailing list
[email protected]
http://www.openlaszlo.org/mailman/listinfo/laszlo-checkins
