ensure exception is correctly unwrapped from proxy

git-svn-id: http://svn.codehaus.org/groovy/trunk/groovy/groovy-core@21326 a5544e8c-8a19-0410-ba12-f9af4593a198
groovy · Dec 15, 2010 · bdd732a · bdd732a
1 parent c4c2046
commit bdd732a
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/src/main/org/codehaus/groovy/runtime/ConversionHandler.java b/src/main/org/codehaus/groovy/runtime/ConversionHandler.java
@@ -16,6 +16,8 @@
 
 package org.codehaus.groovy.runtime;
 
+import groovy.lang.GroovyRuntimeException;
+
 import java.io.Serializable;
 import java.lang.reflect.InvocationHandler;
 import java.lang.reflect.InvocationTargetException;
@@ -76,7 +78,11 @@ public Object getDelegate() {
      */
     public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
         if (!checkMethod(method)) {
-            return invokeCustom(proxy, method, args);
+            try {
+                return invokeCustom(proxy, method, args);
+            } catch (GroovyRuntimeException gre) {
+                throw ScriptBytecodeAdapter.unwrap(gre);
+            }
         }
         try {
             return method.invoke(this, args);