[jboss-cvs] JBossAS SVN: r59392 - projects/aop/trunk/aop/src/main/org/jboss/aop/util

[jboss-cvs-commits at lists.jboss.org]

Author: kabir.khan at jboss.com
Date: 2007-01-05 19:09:16 -0500 (Fri, 05 Jan 2007)
New Revision: 59392

Modified:
   projects/aop/trunk/aop/src/main/org/jboss/aop/util/JavassistMethodHashing.java
Log:
Get methodhashingtestcase passing, this change breaks the not woven BridgeMethodTestCase, so more work is needed on bridge methods

Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/util/JavassistMethodHashing.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/util/JavassistMethodHashing.java	2007-01-05 23:18:44 UTC (rev 59391)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/util/JavassistMethodHashing.java	2007-01-06 00:09:16 UTC (rev 59392)
@@ -159,9 +159,11 @@
             // (in superclasses) are not added either.
             if(!Modifier.isVolatile(declaredMethods[i].getModifiers()))
             {
-            long hash = methodHash(declaredMethods[i]);
-            if(!ignoredHash.contains(new Long(hash)))
-               advised.put(new Long(hash), declaredMethods[i]);
+               long hash = methodHash(declaredMethods[i]);
+               if(!ignoredHash.contains(new Long(hash)))
+               {
+                  advised.put(new Long(hash), declaredMethods[i]);
+               }
             }
             else
             {
@@ -177,8 +179,8 @@
       if (superclass == null) return;
       if (superclass.getName().equals("java.lang.Object")) return;
 
+      populateMethodTables(advised, ignoredHash, superclass.getSuperclass());
       addDeclaredMethods(advised, ignoredHash, superclass);
-      populateMethodTables(advised, ignoredHash, superclass.getSuperclass());
    }
 
    public static HashMap getMethodMap(CtClass clazz) throws Exception