X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Forg%2Fxwt%2FTrap.java;h=770ad51b35d1d6d032d3034db72fd11138d744ad;hb=f2eb7d5128e23542ce51973714eeb41ca1d37a6d;hp=c0dd6707139c7be5daad82c4f3550b3f76686232;hpb=1bd9bc0c2100ba4a1dc2a5f4ca25ec9e0d1b2265;p=org.ibex.core.git

diff --git a/src/org/xwt/Trap.java b/src/org/xwt/Trap.java
index c0dd670..770ad51 100644
--- a/src/org/xwt/Trap.java
+++ b/src/org/xwt/Trap.java
@@ -177,8 +177,14 @@ public class Trap {
                 return ret;
             }
             
-            Object ret = f._call(args);
-            
+	    System.out.println("calling trap on " + name);
+	    Object ret = null;
+	    try {
+		ret = f._call(args);
+	    } catch (org.xwt.js.ByteCodeBlock.ReturnException re) {
+		ret = re.retval;
+	    }
+	    
             // autocascade if required
             if (args.length() > 0 && !isreadtrap && !tc.putCascadeHappened) cascadeFunction._call(args, f);