fixed the issue that serialization fails with non-default class loader.

Tatsuhiko Inoue · Tatsuhiko Inoue · commit 364c47376994 · 2013-02-05T14:37:11.000+09:00
diff --git a/src/main/java/org/msgpack/template/builder/BuildContext.java b/src/main/java/org/msgpack/template/builder/BuildContext.java
@@ -151,7 +151,7 @@ protected void buildReadMethod() throws CannotCompileException, NotFoundExceptio
     protected abstract String buildReadMethodBody();
 
     protected Class<?> createClass() throws CannotCompileException {
-        return (Class<?>) tmplCtClass.toClass(null, getClass().getProtectionDomain());
+        return (Class<?>) tmplCtClass.toClass(director.getClassLoader(), getClass().getProtectionDomain());
     }
 
     protected void saveClass(final String directoryName) throws CannotCompileException, IOException {
diff --git a/src/main/java/org/msgpack/template/builder/JavassistTemplateBuilder.java b/src/main/java/org/msgpack/template/builder/JavassistTemplateBuilder.java
@@ -51,25 +51,24 @@ public JavassistTemplate(Class<T> targetClass, Template<?>[] templates) {
 
     protected int seqId = 0;
 
+    protected ClassLoader loader;
+
     public JavassistTemplateBuilder(TemplateRegistry registry) {
+        this(registry, null);
+    }
+
+    public JavassistTemplateBuilder(TemplateRegistry registry, ClassLoader cl) {
         super(registry);
         pool = new ClassPool();
         boolean appended = false;
-        ClassLoader cl = null;
-        try {
-            cl = Thread.currentThread().getContextClassLoader();
-            if (cl != null) {
-                pool.appendClassPath(new LoaderClassPath(cl));
-                appended = true;
-            }
-        } catch (SecurityException e) {
-            LOG.fine("Cannot append a search path of context classloader");
-            e.printStackTrace();
+        loader = cl;
+        if (loader == null) {
+            loader = pool.getClassLoader();
         }
+
         try {
-            ClassLoader cl2 = getClass().getClassLoader();
-            if (cl2 != null && cl2 != cl) {
-                pool.appendClassPath(new LoaderClassPath(cl2));
+            if (loader != null) {
+                pool.appendClassPath(new LoaderClassPath(loader));
                 appended = true;
             }
         } catch (SecurityException e) {
@@ -91,10 +90,6 @@ public boolean matchType(Type targetType, boolean hasAnnotation) {
         return matched;
     }
 
-    public void addClassLoader(ClassLoader cl) {
-        pool.appendClassPath(new LoaderClassPath(cl));
-    }
-
     protected CtClass makeCtClass(String className) {
         return pool.makeClass(className);
     }
@@ -171,4 +166,8 @@ public <T> Template<T> loadTemplate(Type targetType) {
         BuildContext bc = createBuildContext();
         return bc.loadTemplate(targetClass, entries, tmpls);
     }
+
+    protected ClassLoader getClassLoader() {
+        return loader;
+    }
 }
diff --git a/src/main/java/org/msgpack/template/builder/TemplateBuilderChain.java b/src/main/java/org/msgpack/template/builder/TemplateBuilderChain.java
@@ -52,10 +52,7 @@ protected void reset(final TemplateRegistry registry, final ClassLoader cl) {
         // Javassist{,Beans}TemplateBuilder should be created with reflection for android.
 
         // forceBuilder
-        forceBuilder = new JavassistTemplateBuilder(registry);
-        if (cl != null) {
-            ((JavassistTemplateBuilder) forceBuilder).addClassLoader(cl);
-        }
+        forceBuilder = new JavassistTemplateBuilder(registry, cl);
 
         // builder
         TemplateBuilder builder;

Original file line number	Diff line number	Diff line change
`@@ -151,7 +151,7 @@ protected void buildReadMethod() throws CannotCompileException, NotFoundExceptio`
`151`	`151`	`protected abstract String buildReadMethodBody();`
`152`	`152`
`153`	`153`	`protected Class<?> createClass() throws CannotCompileException {`
`154`		`- return (Class<?>) tmplCtClass.toClass(null, getClass().getProtectionDomain());`
	`154`	`+ return (Class<?>) tmplCtClass.toClass(director.getClassLoader(), getClass().getProtectionDomain());`
`155`	`155`	`}`
`156`	`156`
`157`	`157`	`protected void saveClass(final String directoryName) throws CannotCompileException, IOException {`