Merge pull request #26 from hatgaei/master

fix afterburner serialization issue

Author: cowtowncoder

afterburner/src/main/java/com/fasterxml/jackson/module/afterburner/util/MyClassLoader.java

@@ -23,6 +23,15 @@ public MyClassLoader(ClassLoader parent, boolean tryToUseParent)
         _cfgUseParentLoader = tryToUseParent;
     }
 
+    @Override
+    public Class<?> loadClass(String name) throws ClassNotFoundException {
+        try {
+            return super.loadClass(name);
+        } catch (ClassNotFoundException e) {
+            return getClass().getClassLoader().loadClass(name);
+        }
+    }
+
     /**
      * Helper method called to check whether it is acceptable to create a new
      * class in package that given class is part of.
@@ -63,47 +72,44 @@ public Class<?> loadAndResolve(ClassName className, byte[] byteCode)
         if (old != null) {
             return old;
         }
-        
-        Class<?> impl;
 
         // Important: bytecode is generated with a template name (since bytecode itself
         // is used for checksum calculation) -- must be replaced now, however
         replaceName(byteCode, className.getSlashedTemplate(), className.getSlashedName());
 
         // First: let's try calling it directly on parent, to be able to access protected/package-access stuff:
-        if (_cfgUseParentLoader) {
-            ClassLoader cl = getParent();
-            // if we have parent, that is
-            if (cl != null) {
-                try {
-                    Method method = ClassLoader.class.getDeclaredMethod("defineClass",
-                            new Class[] {String.class, byte[].class, int.class,
-                            int.class});
-                    method.setAccessible(true);
-                    return (Class<?>)method.invoke(getParent(),
-                            className.getDottedName(), byteCode, 0, byteCode.length);
-                } catch (Exception e) {
-                    // Should we handle this somehow?
-                }
+        if (_cfgUseParentLoader && getParent() != null) {
+            try {
+                Method method = ClassLoader.class.getDeclaredMethod("defineClass",
+                        new Class[] {String.class, byte[].class, int.class,
+                        int.class});
+                method.setAccessible(true);
+                return (Class<?>)method.invoke(getParent(),
+                        className.getDottedName(), byteCode, 0, byteCode.length);
+            } catch (Exception e) {
+                // Should we handle this somehow?
             }
         }
 
         // but if that doesn't fly, try to do it from our own class loader
-    
+        return resolveFromThisClassLoader(className, byteCode);
+    }
+
+    private Class<?> resolveFromThisClassLoader(ClassName className, byte[] byteCode) {
         try {
-            impl = defineClass(className.getDottedName(), byteCode, 0, byteCode.length);
+            Class<?> impl = defineClass(className.getDottedName(), byteCode, 0, byteCode.length);
+            // important: must also resolve the class...
+            resolveClass(impl);
+            return impl;
         } catch (LinkageError e) {
             Throwable t = e;
             while (t.getCause() != null) {
                 t = t.getCause();
             }
             throw new IllegalArgumentException("Failed to load class '"+className+"': "+t.getMessage(), t);
         }
-        // important: must also resolve the class...
-        resolveClass(impl);
-        return impl;
     }
-    
+
     public static int replaceName(byte[] byteCode,
             String from, String to)
     {

afterburner/src/test/java/com/fasterxml/jackson/module/afterburner/roundtrip/IsolatedClassLoaderTest.java

@@ -0,0 +1,56 @@
+package com.fasterxml.jackson.module.afterburner.roundtrip;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.module.afterburner.AfterburnerModule;
+import junit.framework.TestCase;
+
+import java.io.IOException;
+import java.net.URL;
+import java.net.URLClassLoader;
+
+/**
+ * Made for a bug found when trying to serialize an Object loaded from an
+ * parent classloader (or, more generally, an isolated classloader).<br/><br/>
+ *
+ * What happens is that MyClassLoader defaults the parent cl to the bean's
+ * classloader, which then extends BeanPropertyAccessor. However, the
+ * bean's classloader doesn't know what BeanPropertyAccessor is and blows
+ * up.<br/><br/>
+ *
+ * The Bean.class (in the resources dir) is simply defined as:<br/><br/>
+ *
+ * <pre>
+ *     public class Bean {
+ *         private String value = "some string";
+ *         public String getValue() { return value; }
+ *     }
+ * </pre>
+ *
+ * It's important that Bean.class doesn't have a setter; otherwise the
+ * exception doesn't occur.<br/><br/>
+ */
+public class IsolatedClassLoaderTest extends TestCase {
+
+    public void testBeanWithSeparateClassLoader() throws IOException {
+
+        AfterburnerModule module = new AfterburnerModule();
+        ObjectMapper mapper = new ObjectMapper();
+        mapper.registerModule(module);
+
+        Object bean = makeObjectFromIsolatedClassloader();
+        String result = mapper.writeValueAsString(bean);
+        assertEquals("{\"value\":\"some string\"}", result);
+    }
+
+    private Object makeObjectFromIsolatedClassloader() {
+        try {
+            URL[] resourcesDir = {getClass().getResource("")};
+            // Parent classloader is null so Afterburner is inaccessible.
+            ClassLoader isolated = new URLClassLoader(resourcesDir, null);
+            Class<?> beanClz = isolated.loadClass("Bean");
+            return beanClz.newInstance();
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+}