Fix bug with proxy unwrapping

forge · Jan 26, 2013 · e3bfa39 · e3bfa39
1 parent 65299ce
commit e3bfa39
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/...sloader-adapter/src/main/java/org/jboss/forge/classloader/ClassLoaderAdapterCallback.java b/...sloader-adapter/src/main/java/org/jboss/forge/classloader/ClassLoaderAdapterCallback.java
@@ -47,7 +47,7 @@ public Object call() throws Exception
             {
                try
                {
-                  if (proxy.getDeclaringClass().equals(toLoader.loadClass(ClassLoaderAdapterProxy.class.getName())))
+                  if (proxy.getDeclaringClass().equals(fromLoader.loadClass(ClassLoaderAdapterProxy.class.getName())))
                   {
                      return delegate;
                   }
@@ -380,11 +380,6 @@ public boolean isHandled(Method method)
    /*
     * Helper Types
     */
-   public static interface ClassLoaderAdapterProxy
-   {
-      Object getDelegate();
-   }
-
    static class ProxyTypeInspector
    {
       public static Class<?>[] getCompatibleClassHierarchy(ClassLoader loader, Class<?> origin)

diff --git a/classloader-adapter/src/main/java/org/jboss/forge/classloader/ClassLoaderAdapterProxy.java b/classloader-adapter/src/main/java/org/jboss/forge/classloader/ClassLoaderAdapterProxy.java
@@ -0,0 +1,6 @@
+package org.jboss.forge.classloader;
+
+public interface ClassLoaderAdapterProxy
+{
+   Object getDelegate();
+}