Fixed it up abit...

Author: RealMangorage

src/main/java/org/mangorage/bootstrap/internal/MangoLoader.java

@@ -78,40 +78,40 @@ void loadModuleConfiguration() {
                 });
     }
 
-//    /**
-//     * Loads the class with the specified binary name.
-//     */
-//    @Override
-//    protected Class<?> loadClass(String cn, boolean resolve) throws ClassNotFoundException
-//    {
-//
-//        synchronized (getClassLoadingLock(cn)) {
-//            // check if already loaded
-//            Class<?> c = findLoadedClass(cn);
-//
-//            if (c == null) {
-//
-//                LoadedModule loadedModule = findLoadedModule(cn);
-//
-//                if (loadedModule != null) {
-//
-//                    // class is in module defined to this class loader
-//                    c = defineClass(cn, loadedModule);
-//
-//                } else {
-//                    return getParent().loadClass(cn);
-//                }
-//            }
-//
-//            if (c == null)
-//                throw new ClassNotFoundException(cn);
-//
-//            if (resolve)
-//                resolveClass(c);
-//
-//            return c;
-//        }
-//    }
+    /**
+     * Loads the class with the specified binary name.
+     */
+    @Override
+    protected Class<?> loadClass(String cn, boolean resolve) throws ClassNotFoundException
+    {
+
+        synchronized (getClassLoadingLock(cn)) {
+            // check if already loaded
+            Class<?> c = findLoadedClass(cn);
+
+            if (c == null) {
+
+                LoadedModule loadedModule = findLoadedModule(cn);
+
+                if (loadedModule != null) {
+
+                    // class is in module defined to this class loader
+                    c = defineClass(cn, loadedModule);
+
+                } else {
+                    return getParent().loadClass(cn);
+                }
+            }
+
+            if (c == null)
+                throw new ClassNotFoundException(cn);
+
+            if (resolve)
+                resolveClass(c);
+
+            return c;
+        }
+    }
 
     @Override
     protected URL findResource(String moduleName, String name) throws IOException {
@@ -167,30 +167,24 @@ private Class<?> defineClass(String cn, LoadedModule loadedModule) {
                 return null;
             }
 
-            try {
-                return defineClass(cn, bb, loadedModule.getCodeSource());
-            } finally {
-                reader.release(bb);
-            }
+            if (transformers.containsClass(cn))
+                return transformers.getClazz(cn);
+
+            byte[] classbytes = bb.array();
 
-//            if (transformers.containsClass(cn))
-//                return transformers.getClazz(cn);
-//
-//            byte[] classbytes = bb.array();
-//
-//            byte[] classBytesModified = transformers.transform(cn, classbytes);
-//
-//            if (classBytesModified != null) {
-//                Class<?> clz = defineClass(cn, classBytesModified, 0, classBytesModified.length, loadedModule.getCodeSource());
-//                transformers.add(cn, clz);
-//                return clz;
-//            } else {
-//                try {
-//                    return defineClass(cn, bb, loadedModule.getCodeSource());
-//                } finally {
-//                    reader.release(bb);
-//                }
-//            }
+            byte[] classBytesModified = transformers.transform(cn, classbytes);
+
+            if (classBytesModified != null) {
+                Class<?> clz = defineClass(cn, classBytesModified, 0, classBytesModified.length, loadedModule.getCodeSource());
+                transformers.add(cn, clz);
+                return clz;
+            } else {
+                try {
+                    return defineClass(cn, bb, loadedModule.getCodeSource());
+                } finally {
+                    reader.release(bb);
+                }
+            }
         } catch (IOException ioe) {
             // TBD on how I/O errors should be propagated
             return null;