put back callback to ClassPool.writeAsClass. This callback to ClassPool instance

is required to be able to override how dynamic class creation works


git-svn-id: http://anonsvn.jboss.org/repos/javassist/trunk@91 30ef5769-5b8d-40dd-aea6-55b5d6557bb3

2 files changed, 25 insertions, 16 deletions

diff --git a/src/main/javassist/ClassPool.java b/src/main/javassist/ClassPool.java
index 8139ac5d..ee41d992 100644
--- a/src/main/javassist/ClassPool.java
+++ b/src/main/javassist/ClassPool.java
@@ -260,21 +260,30 @@ public class ClassPool {
         return classLoader.loadClass(name);
     }
 
-    static Class loadClass(String classname, byte[] classfile)
-        throws NotFoundException, IOException, CannotCompileException
-    {
-        if (classLoader == null)
-            classLoader = new SimpleLoader();
-
-        try {
-            return classLoader.loadClass(classname, classfile);
-        }
-        catch (ClassFormatError e) {
-            throw new CannotCompileException(e, classname);
-        }
-    }
-
-    /**
+   /**
+    * Callback to write the class and create a Class object
+    * ClassPool can be extended to override this behavior
+    * @param classname
+    * @param classfile
+    * @return
+    * @throws NotFoundException
+    * @throws IOException
+    * @throws CannotCompileException
+    */
+   public Class writeAsClass(String classname, byte[] classfile)
+       throws CannotCompileException
+   {
+       try {
+          if (classLoader == null)
+              classLoader = new SimpleLoader();
+           return classLoader.loadClass(classname, classfile);
+       }
+       catch (ClassFormatError e) {
+           throw new CannotCompileException(e, classname);
+       }
+   }
+
+   /**
      * Reads a class file and constructs a <code>CtClass</code>
      * object with a new name.
      * This method is useful if you want to generate a new class as a copy
diff --git a/src/main/javassist/CtClass.java b/src/main/javassist/CtClass.java
index bfca85fa..d3bc5379 100644
--- a/src/main/javassist/CtClass.java
+++ b/src/main/javassist/CtClass.java
@@ -849,7 +849,7 @@ public abstract class CtClass {
     public Class toClass()
         throws NotFoundException, IOException, CannotCompileException
     {
-        return ClassPool.loadClass(getName(), toBytecode());
+        return getClassPool().writeAsClass(getName(), toBytecode());
     }
 
     /**