From: megacz <megacz@xwt.org>
Date: Fri, 30 Jan 2004 07:00:54 +0000 (+0000)
Subject: 2003/06/09 01:45:29
X-Git-Tag: RC3~938
X-Git-Url: http://git.megacz.com/?p=org.ibex.core.git;a=commitdiff_plain;h=f2eb7d5128e23542ce51973714eeb41ca1d37a6d

2003/06/09 01:45:29

darcs-hash:20040130070054-2ba56-4fe9f83486b7b9bedb88da9c6f0a00b1e15123f8.gz
---

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);