Supporting inner class reloading

zhourenjian@gmail.com · zhourenjian@gmail.com · commit 112e2d777689 · 2013-09-22T06:52:36.000Z
diff --git a/sources/net.sf.j2s.ajax/ajaxrpc/net/sf/j2s/ajax/SimpleClassLoader.java b/sources/net.sf.j2s.ajax/ajaxrpc/net/sf/j2s/ajax/SimpleClassLoader.java
@@ -60,7 +60,21 @@ protected boolean isSystemClass(String clazzName) {
 
 	@Override
 	public Class<?> loadClass(String clazzName) throws ClassNotFoundException {
-		if (targetClasses.contains(clazzName)) {
+		boolean contains = targetClasses.contains(clazzName);
+		if (!contains) {
+			// Check inner classes
+			int idx = clazzName.indexOf('$');
+			if (idx != -1) { // RPC$1
+				contains = targetClasses.contains(clazzName.substring(0, idx));
+			}
+			if (!contains) {
+				idx = clazzName.lastIndexOf('.');
+				if (idx != -1) { // RPC.User or net.sf.j2s.XXXRPC
+					contains = targetClasses.contains(clazzName.substring(0, idx));
+				}
+			}
+		}
+		if (contains) {
 			Class<?> clazz = loadedClasses.get(clazzName);
 			if (clazz != null) {
 				return clazz;
