fixed #124

HotswapProjects · Apr 20, 2016 · e1d7d17 · e1d7d17
1 parent 478da7f
commit e1d7d17
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 10 deletions.
diff --git a/...odules-plugin/src/main/java/org/hotswap/agent/plugin/jbossmodules/JBossModulesPlugin.java b/...odules-plugin/src/main/java/org/hotswap/agent/plugin/jbossmodules/JBossModulesPlugin.java
@@ -17,7 +17,7 @@
  */
 @Plugin(name = "JBossModules",
         description = "JBossModules - Jboss modular class loading implementation. ",
-        testedVersions = {"1.4.4"},
+        testedVersions = {"1.4.4, 1.5.1"},
         expectedVersions = {"1.x"},
         supportClass={ModuleClassLoaderTransformer.class}
 )

diff --git a/...gin/src/main/java/org/hotswap/agent/plugin/jbossmodules/ModuleClassLoaderTransformer.java b/...gin/src/main/java/org/hotswap/agent/plugin/jbossmodules/ModuleClassLoaderTransformer.java
@@ -76,28 +76,31 @@ public static void patchModuleClassLoader(ClassPool classPool, CtClass ctClass)
             );
 
             CtMethod methRecalculate = ctClass.getDeclaredMethod("recalculate");
-            methRecalculate.setBody(
-                    "{" +
-                    "   final org.jboss.modules.Paths p = this.paths" + pathsGetter + ";" +
-                    "   boolean ret = setResourceLoaders(p, (org.jboss.modules.ResourceLoaderSpec[])p.getSourceList(NO_RESOURCE_LOADERS));" +
+            methRecalculate.setName("_recalculate");
+
+            ctClass.addMethod(CtNewMethod.make(
+                    "boolean recalculate() {" +
+                    "   boolean ret = _recalculate();" +
                     "   __setupPrepend();" +
                     "   return ret;" +
-                    "}"
-            );
+                    "}",
+                    ctClass
+            ));
+
 
             CtClass ctResLoadClass = classPool.get("org.jboss.modules.ResourceLoaderSpec[]");
 
             CtMethod methResourceLoaders = ctClass.getDeclaredMethod("setResourceLoaders", new CtClass[] { ctResLoadClass });
             methResourceLoaders.setBody(
                     "{" +
-                    "   boolean ret = setResourceLoaders(this.paths" + pathsGetter + ", $1);" +
+                    "   boolean ret = setResourceLoaders((org.jboss.modules.Paths)this.paths" + pathsGetter + ", $1);" +
                     "   __setupPrepend();" +
                     "   return ret;" +
                     "}"
             );
 
         } catch (NotFoundException e) {
-            LOGGER.warning("Unable to find field \"paths\" in org.jboss.modules.ModuleClassLoader.");
+            LOGGER.warning("Unable to find field \"paths\" in org.jboss.modules.ModuleClassLoader.", e);
         }
     }
 
@@ -133,7 +136,7 @@ public static void patchModulesPaths(ClassPool classPool, CtClass ctClass) throw
                     "}", ctClass)
             );
         } catch (NotFoundException e) {
-            LOGGER.warning("Unable to find methos \"getAllPaths()\" in org.jboss.modules.Paths.");
+            LOGGER.warning("Unable to find method \"getAllPaths()\" in org.jboss.modules.Paths.", e);
         }
     }