FORGE-1734 - CCE when starting Forge 2 in Eclipse.

forge · Apr 4, 2014 · 8eec1ef · 8eec1ef
1 parent ae23876
commit 8eec1ef
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/proxy/src/main/java/org/jboss/forge/furnace/proxy/ClassLoaderAdapterCallback.java b/proxy/src/main/java/org/jboss/forge/furnace/proxy/ClassLoaderAdapterCallback.java
@@ -211,9 +211,13 @@ private Object enhanceResult(final Method method, Object result) throws Exceptio
          else if (returnTypeNeedsEnhancement(returnType, result, unwrappedResultType))
          {
             result = stripClassLoaderAdapters(result);
-            final Class<?>[] resultHierarchy = removeProxyTypes(ProxyTypeInspector.getCompatibleClassHierarchy(
-                     callingLoader,
-                     result.getClass()));
+            Class<?>[] resultHierarchy = removeProxyTypes(ProxyTypeInspector.getCompatibleClassHierarchy(
+                     callingLoader, result.getClass()));
+
+            final Class<?>[] unwrappedResultHierarchy = removeProxyTypes(ProxyTypeInspector
+                     .getCompatibleClassHierarchy(callingLoader, unwrappedResultType));
+
+            resultHierarchy = mergeHierarchies(resultHierarchy, unwrappedResultHierarchy);
 
             Class<?>[] returnTypeHierarchy = removeProxyTypes(ProxyTypeInspector.getCompatibleClassHierarchy(
                      callingLoader, returnType));