traps: don't delete entry after consuming it

see the source code comment. would be nice to enable deletion again

diff --git a/Mate/MethodPool.hs b/Mate/MethodPool.hs
index 7a0cda170964a761e50affbfe0a3c31d43e940d0..f7038f3b1e1afdaa640d274ba1c5e2c39a4a954c 100644 (file)
--- a/Mate/MethodPool.hs
+++ b/Mate/MethodPool.hs
@@ -50,7 +50,10 @@ getMethodEntry signal_from methodtable = do
           (InterfaceMethod _ (MethodInfo methname _ msig)) -> newMi methname msig
           _ -> error "getMethodEntry: no TrapCause found. abort."
         where newMi mn = MethodInfo mn (vmap M.! fromIntegral methodtable)
           (InterfaceMethod _ (MethodInfo methname _ msig)) -> newMi methname msig
           _ -> error "getMethodEntry: no TrapCause found. abort."
         where newMi mn = MethodInfo mn (vmap M.! fromIntegral methodtable)

-  setTrapMap $ M.delete w32_from tmap
+  -- bernhard (TODO): doesn't work with gnu classpath at some point. didn't
+  --                  figured out the problem yet :/ therefore, I have no
+  --                  testcase for replaying the situation.
+  -- setTrapMap $ M.delete w32_from tmap

   case M.lookup mi' mmap of
     Nothing -> do
       cls <- getClassFile cm
   case M.lookup mi' mmap of
     Nothing -> do
       cls <- getClassFile cm

diff --git a/tests/InstanceLong1.java b/tests/InstanceLong1.java
index 5c7250e2f079228af7a963002cc3a3dafeb90c7f..e685c19d1728576c7a584c23f238ebb9e5eb0874 100644 (file)
--- a/tests/InstanceLong1.java
+++ b/tests/InstanceLong1.java
@@ -7,6 +7,9 @@ public class InstanceLong1 {
                new InstanceLong1().a1337();
                new InstanceLong1().a0001();
                new InstanceLong1().a2050();
                new InstanceLong1().a1337();
                new InstanceLong1().a0001();
                new InstanceLong1().a2050();

+               new InstanceLong1().a2050();
+               new InstanceLong1().a2050();
+               new InstanceLong1().a2050();

        }
 
        public void a0001 () { System.out.printf("a0001\n"); }
        }
 
        public void a0001 () { System.out.printf("a0001\n"); }