1. Fix a bug that super#toString which is Object#toString may causes incorrect calling exceptions.

zhourenjian · zhourenjian · commit ebfe5ce1c4c3 · 2007-06-01T15:36:25.000Z
2. Fix bug that the lastMethod caches inside delegating methods blocks Java2Script Hotspot to work correctly.
3. Other bug-fix
diff --git a/sources/net.sf.j2s.java.core/src/java/lang/Class.js b/sources/net.sf.j2s.java.core/src/java/lang/Class.js
@@ -497,6 +497,8 @@ Clazz.superCall = function (objThis, clazzThis, funName, funParams) {
 				// This is a single method, call directly!
 				fx = clazzFun;
 			}
+		} else if (clazzFun.stacks == null) { // super.toString
+			fx = clazzFun;
 		} else { // normal wrapped method
 			var stacks = clazzFun.stacks;
 			var length = stacks.length;
diff --git a/sources/net.sf.j2s.java.core/src/java/lang/ClassExt.js b/sources/net.sf.j2s.java.core/src/java/lang/ClassExt.js
@@ -813,6 +813,18 @@ Clazz.forName = function (clazzName) {
 
 /* For hotspot and unloading */
 
+/* private */
+Clazz.cleanDelegateMethod = function (m) {
+	if (m == null) return;
+	if (typeof m == "function" && m.lastMethod != null
+			&& m.lastParams != null && m.lastClaxxRef != null) {
+		m.lastMethod = null;
+		m.lastParams = null;
+		m.lastClaxxRef = null;
+	}
+};
+
+/* public */
 Clazz.unloadClass = function (qClazzName) {
 	var cc = Clazz.evalType (qClazzName);
 	if (cc != null) {
@@ -855,6 +867,13 @@ Clazz.unloadClass = function (qClazzName) {
 				}
 			}
 		}
+		
+		for (var m in cc) {
+			Clazz.cleanDelegateMethod (cc[m]);
+		}
+		for (var m in cc.prototype) {
+			Clazz.cleanDelegateMethod (cc.prototype[m]);
+		}
 
 		if (window["ClazzLoader"] != null) {
 			ClazzLoader.unloadClassExt (qClazzName);
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
@@ -114,6 +114,7 @@
  # xxxoptionals -> so
  # declaration -> dcl
  # optionalsLoaded -> oled
+ # qClazzName ->Nq
  #-*/
  
 /**
@@ -2515,7 +2516,7 @@ ClazzLoader.updateHotspot = function () {
 					return function () {
 						// succeeded!
 						if (window["ClassLoaderProgressMonitor"] != null) {
-							ClassLoaderProgressMonitor.showStatus ("Class " + qClazzName + " is reloaded.", true);
+							ClassLoaderProgressMonitor.showStatus ("Class " + clazz + " is reloaded.", true);
 						}
 						Clazz.unloadedClasses[clazz] = null;
 					};
@@ -2569,15 +2570,19 @@ ClazzLoader.hotspotMonitoring = function () {
 		script.src = hotspotURL;
 		if (typeof (script.onreadystatechange) == "undefined") { // W3C
 			script.onload = script.onerror = function () {
-				ClazzLoader.lastHotspotScriptLoaded = true;
-				ClazzLoader.removeHotspotScriptNode (this);
+				try {
+					ClazzLoader.lastHotspotScriptLoaded = true;
+					ClazzLoader.removeHotspotScriptNode (this);
+				} catch (e) {}; // refreshing browser may cause exceptions
 			};
 		} else {
 			script.onreadystatechange = function () {
 				var state = "" + this.readyState;
 				if (state == "loaded" || state == "complete") {
-					ClazzLoader.lastHotspotScriptLoaded = true;
-					ClazzLoader.removeHotspotScriptNode (this);
+					try {
+						ClazzLoader.lastHotspotScriptLoaded = true;
+						ClazzLoader.removeHotspotScriptNode (this);
+					} catch (e) {}; // refreshing browser may cause exceptions
 				}
 			};
 		}

Original file line number	Diff line number	Diff line change
`@@ -497,6 +497,8 @@ Clazz.superCall = function (objThis, clazzThis, funName, funParams) {`
`497`	`497`	`// This is a single method, call directly!`
`498`	`498`	`fx = clazzFun;`
`499`	`499`	`}`
	`500`	`+ } else if (clazzFun.stacks == null) { // super.toString`
	`501`	`+ fx = clazzFun;`
`500`	`502`	`} else { // normal wrapped method`
`501`	`503`	`var stacks = clazzFun.stacks;`
`502`	`504`	`var length = stacks.length;`