Fixing bug of ClazzLoader and other core classes

zhourenjian · zhourenjian · commit 2255b09aac4b · 2010-11-27T17:16:34.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
@@ -2074,26 +2074,34 @@ ClazzLoader.load = function (musts, clazz, optionals, declaration) {
 		return;
 		//*/
 	}
-	var okToInit = true;
+	//var okToInit = true;
 	if (musts != null && musts.length != 0) {
 		ClazzLoader.unwrapArray (musts);
 		for (var i = 0; i < musts.length; i++) {
 			var name = musts[i];
 			if (name == null || name.length == 0) {
 				continue;
 			}
+			var n = ClazzLoader.findClass (name);
 			if (ClazzLoader.isClassDefined (name) 
 					|| ClazzLoader.isClassExcluded (name)) {
+				if (n != null // non-system classes
+						&& n.status != ClazzNode.STATUS_OPTIONALS_LOADED) {
+					ClazzLoader.addChildClassNode (node, n, 1);
+				}
 				continue;
 			}
-			okToInit = false;
-			var n = ClazzLoader.findClass (name);
+			//okToInit = false;
 			if (n == null) {
 				n = new ClazzNode ();
 				n.name = musts[i];
 				n.status = ClazzNode.STATUS_KNOWN;
+				ClazzLoader.addChildClassNode (node, n, 1);
+			} else {
+				if (n.status != ClazzNode.STATUS_OPTIONALS_LOADED) {
+					ClazzLoader.addChildClassNode (node, n, 1);
+				}
 			}
-			ClazzLoader.addChildClassNode (node, n, 1);
 		}
 	}
 
@@ -2121,29 +2129,33 @@ ClazzLoader.load = function (musts, clazz, optionals, declaration) {
 		node.status = ClazzNode.STATUS_CONTENT_LOADED;
 	}
 
-	var isOptionalsOK = true;
+	//var isOptionalsOK = true;
 	if (optionals != null && optionals.length != 0) {
 		ClazzLoader.unwrapArray (optionals);
 		for (var i = 0; i < optionals.length; i++) {
 			var name = optionals[i];
 			if (name == null || name.length == 0) {
 				continue;
 			}
-			/*
+			var n = ClazzLoader.findClass (name);
 			if (ClazzLoader.isClassDefined (name) 
 					|| ClazzLoader.isClassExcluded (name)) {
+				if (n != null // non-system classes
+						&& n.status != ClazzNode.STATUS_OPTIONALS_LOADED) {
+					ClazzLoader.addChildClassNode (node, n, -1);
+				}
 				continue;
 			}
-			//*/
-			isOptionalsOK = false;
-			var n = ClazzLoader.findClass (name);
+			//isOptionalsOK = false;
 			if (n == null) {
 				n = new ClazzNode ();
 				n.name = optionals[i];
 				n.status = ClazzNode.STATUS_KNOWN;
-			}
-			if (n.status != ClazzNode.STATUS_OPTIONALS_LOADED) {
 				ClazzLoader.addChildClassNode (node, n, -1);
+			} else {
+				if (n.status != ClazzNode.STATUS_OPTIONALS_LOADED) {
+					ClazzLoader.addChildClassNode (node, n, -1);
+				}
 			}
 		}
 	}
diff --git a/sources/net.sf.j2s.java.core/src/java/lang/reflect/Method.java b/sources/net.sf.j2s.java.core/src/java/lang/reflect/Method.java
@@ -352,7 +352,7 @@ public int hashCode() {
      * 	m = this.clazz[this.getName ()];
      * }
      * if (m != null) {
-     * 	m.apply(receiver,args);
+     * 	return m.apply(receiver,args);
      * } else {
      * 	// should never reach here!
      * }
