[jboss-cvs] JBossAS SVN: r79424 - in projects/aop/trunk: aop/src/main/org/jboss/aop/instrument and 1 other directory.

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

Author: kabir.khan at jboss.com
Date: 2008-10-13 18:19:51 -0400 (Mon, 13 Oct 2008)
New Revision: 79424

Modified:
   projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/Instrumentor.java
   projects/aop/trunk/pom.xml
Log:
[JBAOP-636] Update javassist and get rid of hack in Instrumentor.addMixinMethod()

Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/Instrumentor.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/Instrumentor.java	2008-10-13 21:52:56 UTC (rev 79423)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/Instrumentor.java	2008-10-13 22:19:51 UTC (rev 79424)
@@ -260,25 +260,6 @@
       newMethod.setModifiers(Modifier.PUBLIC);
       clazz.addMethod(newMethod);
       
-      //TODO remove this hack once we have a version of javassist that makes the _added_m$ methods synthetic 
-      //The following depends on javassist internals
-      try
-      {
-         ClassFile cf = clazz.getClassFile();
-         List<MethodInfo> infos = cf.getMethods();
-         MethodInfo info = infos.get(infos.size() - 2);
-         if (info.getName().startsWith("_added_m$"))
-         {
-            addSyntheticAttribute(info);
-         }
-      }
-      catch(Exception e)
-      {
-         if (AspectManager.verbose)
-         {
-            logger.warn("Could not find wrapper method for " + method.getName());
-         }
-      }
       return newMethod;
    }
 

Modified: projects/aop/trunk/pom.xml
===================================================================
--- projects/aop/trunk/pom.xml	2008-10-13 21:52:56 UTC (rev 79423)
+++ projects/aop/trunk/pom.xml	2008-10-13 22:19:51 UTC (rev 79424)
@@ -22,7 +22,7 @@
   </scm>
   
   <properties>
-    <version.javassist.javassist>3.8.1.GA</version.javassist.javassist>
+    <version.javassist.javassist>3.9.0.GA</version.javassist.javassist>
     <version.jboss.jbossas.core-libs>4.0.4.GA</version.jboss.jbossas.core-libs>
     <version.org.jboss.jbossas>5.0.0.CR2</version.org.jboss.jbossas>
     <version.org.jboss.jboss-common-core>2.2.8.GA</version.org.jboss.jboss-common-core>