Fixing class loader bug of failed to load some classes under some scenarios

zhourenjian · zhourenjian · commit dc5404d5592c · 2012-05-12T10:12:42.000Z
diff --git a/sources/net.sf.j2s.java.core/src/java/lang/ClassLoader.js b/sources/net.sf.j2s.java.core/src/java/lang/ClassLoader.js
@@ -1728,11 +1728,11 @@ $_L(["$wt.widgets.Widget","$wt.graphics.Drawable"],"$wt.widgets.Control",
 		if (node.status < ClazzNode.STATUS_DECLARED) {
 			var decl = node.declaration;
 			if (decl != null) {
-				if (decl.executed == false) {
+				if (!decl.executed) {
 					decl ();
 					decl.executed = true;
-				} else {
-					decl ();
+				//} else {
+				//	decl ();
 				}
 			}
 			node.status = ClazzNode.STATUS_DECLARED;
@@ -2514,7 +2514,9 @@ ClazzLoader.loadClass = function (name, optionalsLoaded, forced, async) {
 			} else {
 				optionalsLoaded ();
 			}
-		} // else ... should be called later
+		} else { // should be called later
+			window.setTimeout (optionalsLoaded, 25);
+		}
 	}
 	
 };

Original file line number	Diff line number	Diff line change
`@@ -1728,11 +1728,11 @@ $_L(["$wt.widgets.Widget","$wt.graphics.Drawable"],"$wt.widgets.Control",`
`1728`	`1728`	`if (node.status < ClazzNode.STATUS_DECLARED) {`
`1729`	`1729`	`var decl = node.declaration;`
`1730`	`1730`	`if (decl != null) {`
`1731`		`- if (decl.executed == false) {`
	`1731`	`+ if (!decl.executed) {`
`1732`	`1732`	`decl ();`
`1733`	`1733`	`decl.executed = true;`
`1734`		`- } else {`
`1735`		`- decl ();`
	`1734`	`+ //} else {`
	`1735`	`+ // decl ();`
`1736`	`1736`	`}`
`1737`	`1737`	`}`
`1738`	`1738`	`node.status = ClazzNode.STATUS_DECLARED;`
`@@ -2514,7 +2514,9 @@ ClazzLoader.loadClass = function (name, optionalsLoaded, forced, async) {`
`2514`	`2514`	`} else {`
`2515`	`2515`	`optionalsLoaded ();`
`2516`	`2516`	`}`
`2517`		`- } // else ... should be called later`
	`2517`	`+ } else { // should be called later`
	`2518`	`+ window.setTimeout (optionalsLoaded, 25);`
	`2519`	`+ }`
`2518`	`2520`	`}`
`2519`	`2521`
`2520`	`2522`	`};`