Exception proxy stack traces are now properly set.

forge · Aug 22, 2013 · 5d14943 · 5d14943
1 parent 682c6c9
commit 5d14943
Showing 1 changed file with 12 additions and 6 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
@@ -15,6 +15,7 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.Callable;
+import java.util.logging.Level;
 import java.util.logging.Logger;
 
 import javassist.util.proxy.MethodFilter;
@@ -30,6 +31,7 @@
  */
 public class ClassLoaderAdapterCallback implements MethodHandler
 {
+   private static final Logger log = Logger.getLogger(ClassLoaderAdapterCallback.class.getName());
    private static final ClassLoader JAVASSIST_LOADER = ProxyObject.class.getClassLoader();
 
    private final Object delegate;
@@ -197,8 +199,9 @@ private Object enhanceResult(final Method method, Object result)
       return result;
    }
 
-   private Exception enhanceException(final Method method, Exception exception)
+   private Exception enhanceException(final Method method, final Exception exception)
    {
+      Exception result = exception;
       try
       {
          if (exception != null)
@@ -224,18 +227,21 @@ private Exception enhanceException(final Method method, Exception exception)
 
                if (!Modifier.isFinal(unwrappedExceptionType.getModifiers()))
                {
-                  exception = enhance(callingLoader, exceptionLoader, method, exception, exceptionHierarchy);
+                  result = enhance(callingLoader, exceptionLoader, method, exception, exceptionHierarchy);
+                  result.setStackTrace(exception.getStackTrace());
                }
             }
          }
       }
       catch (Exception e)
       {
-         throw new ContainerException("Failed to enhance exception type: [" + exception.getClass().getName()
-                  + "] during proxied invocation of [" + method.getDeclaringClass().getName() + "." + method.getName()
-                  + "]. \n\nOriginal exception was: ", e);
+         log.log(Level.WARNING,
+                  "Could not enhance exception for passing through ClassLoader boundary. Exception type ["
+                           + exception.getClass().getName() + "], Caller [" + callingLoader + "], Delegate ["
+                           + delegateLoader + "]");
+         return exception;
       }
-      return exception;
+      return result;
    }
 
    @SuppressWarnings({ "unchecked", "rawtypes" })