Fixed bug that ClassLoader does not load optional classes if they are already being loaded but not loaded completely.

zhourenjian · zhourenjian · commit a690231ce188 · 2010-08-22T03:15:32.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
@@ -2129,18 +2129,22 @@ ClazzLoader.load = function (musts, clazz, optionals, declaration) {
 			if (name == null || name.length == 0) {
 				continue;
 			}
+			/*
 			if (ClazzLoader.isClassDefined (name) 
 					|| ClazzLoader.isClassExcluded (name)) {
 				continue;
 			}
+			//*/
 			isOptionalsOK = false;
 			var n = ClazzLoader.findClass (name);
 			if (n == null) {
 				n = new ClazzNode ();
 				n.name = optionals[i];
 				n.status = ClazzNode.STATUS_KNOWN;
 			}
-			ClazzLoader.addChildClassNode (node, n, -1);
+			if (n.status != ClazzNode.STATUS_OPTIONALS_LOADED) {
+				ClazzLoader.addChildClassNode (node, n, -1);
+			}
 		}
 	}
 };

Original file line number	Diff line number	Diff line change
`@@ -2129,18 +2129,22 @@ ClazzLoader.load = function (musts, clazz, optionals, declaration) {`
`2129`	`2129`	`if (name == null \|\| name.length == 0) {`
`2130`	`2130`	`continue;`
`2131`	`2131`	`}`
	`2132`	`+ /*`
`2132`	`2133`	`if (ClazzLoader.isClassDefined (name)`
`2133`	`2134`	`\|\| ClazzLoader.isClassExcluded (name)) {`
`2134`	`2135`	`continue;`
`2135`	`2136`	`}`
	`2137`	`+ //*/`
`2136`	`2138`	`isOptionalsOK = false;`
`2137`	`2139`	`var n = ClazzLoader.findClass (name);`
`2138`	`2140`	`if (n == null) {`
`2139`	`2141`	`n = new ClazzNode ();`
`2140`	`2142`	`n.name = optionals[i];`
`2141`	`2143`	`n.status = ClazzNode.STATUS_KNOWN;`
`2142`	`2144`	`}`
`2143`		`- ClazzLoader.addChildClassNode (node, n, -1);`
	`2145`	`+ if (n.status != ClazzNode.STATUS_OPTIONALS_LOADED) {`
	`2146`	`+ ClazzLoader.addChildClassNode (node, n, -1);`
	`2147`	`+ }`
`2144`	`2148`	`}`
`2145`	`2149`	`}`
`2146`	`2150`	`};`