[jboss-cvs] JBossAS SVN: r58955 - branches/Branch_AOP_1_5/aop/src/main/org/jboss/aop/instrument

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

Author: flavia.rainone
Date: 2006-12-09 18:14:30 -0500 (Sat, 09 Dec 2006)
New Revision: 58955

Modified:
   branches/Branch_AOP_1_5/aop/src/main/org/jboss/aop/instrument/MethodExecutionTransformer.java
   branches/Branch_AOP_1_5/aop/src/main/org/jboss/aop/instrument/OptimizedMethodExecutionTransformer.java
Log:
[JBAOP-318] Temporary approach to solve the issue on OptimizedMethodExecutionTransformer only.

Modified: branches/Branch_AOP_1_5/aop/src/main/org/jboss/aop/instrument/MethodExecutionTransformer.java
===================================================================
--- branches/Branch_AOP_1_5/aop/src/main/org/jboss/aop/instrument/MethodExecutionTransformer.java	2006-12-09 05:37:49 UTC (rev 58954)
+++ branches/Branch_AOP_1_5/aop/src/main/org/jboss/aop/instrument/MethodExecutionTransformer.java	2006-12-09 23:14:30 UTC (rev 58955)
@@ -379,5 +379,13 @@
       {
          return instrumentor;
       }
+      
+      /**
+       * @param wmethod2
+       */
+      public void setMethod(CtMethod method)
+      {
+         this.method = method;
+      }
    }
 }
\ No newline at end of file

Modified: branches/Branch_AOP_1_5/aop/src/main/org/jboss/aop/instrument/OptimizedMethodExecutionTransformer.java
===================================================================
--- branches/Branch_AOP_1_5/aop/src/main/org/jboss/aop/instrument/OptimizedMethodExecutionTransformer.java	2006-12-09 05:37:49 UTC (rev 58954)
+++ branches/Branch_AOP_1_5/aop/src/main/org/jboss/aop/instrument/OptimizedMethodExecutionTransformer.java	2006-12-09 23:14:30 UTC (rev 58955)
@@ -52,22 +52,28 @@
       CtMethod wmethod = CtNewMethod.copy(trans.getMethod(), trans.getClazz(), null);
 
       // generate Wrapper
+      /* TODO FLAVIA COMMENTED THIS TEMPORARILY */
       String originalName = trans.getOriginalName();
       wmethod.setName(wrappedName);
       trans.getClazz().addMethod(wmethod);
-      moveAnnotations(trans.getMethod(), wmethod);
+      //moveAnnotations(trans.getMethod(), wmethod);
       String optimizedInvocation = OptimizedMethodInvocations.createOptimizedInvocationClass(trans.getInstrumentor(), trans.getClazz(), trans.getMethod());
-      trans.getMethod().setName(wrappedName);
-      wmethod.setName(originalName);
+      //trans.getMethod().setName(wrappedName);
+      //wmethod.setName(originalName);
 
-      trans.setWMethod(wmethod, wrappedName);
+      //trans.setWMethod(wmethod, wrappedName);
+      
+      /* TERMPORARY NEW CODE LINES */
+      trans.setWMethod(trans.getMethod(), wrappedName);
+      trans.setMethod(wmethod);
+      
       // prepareForWrapping
-      getWrapper().prepareForWrapping(wmethod, WrapperTransformer.SINGLE_TRANSFORMATION_INDEX);
+      getWrapper().prepareForWrapping(trans.getWMethod(), WrapperTransformer.SINGLE_TRANSFORMATION_INDEX);
 
       if (wrap)
       {
          // wrap
-         getWrapper().wrap(wmethod, WrapperTransformer.SINGLE_TRANSFORMATION_INDEX);
+         getWrapper().wrap(trans.getWMethod(), WrapperTransformer.SINGLE_TRANSFORMATION_INDEX);
          // executeWrapping
          setWrapperBody(trans, methodInfoField, optimizedInvocation);
       }