[jboss-cvs] JBossAS SVN: r112704 - projects/aop/branches/JBoss_AOP_2_1_6_GA_CP/aop/src/main/java/org/jboss/aop/instrument.

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

Author: flavia.rainone at jboss.com
Date: 2012-02-27 23:57:21 -0500 (Mon, 27 Feb 2012)
New Revision: 112704

Modified:
   projects/aop/branches/JBoss_AOP_2_1_6_GA_CP/aop/src/main/java/org/jboss/aop/instrument/ClassicInstrumentor.java
   projects/aop/branches/JBoss_AOP_2_1_6_GA_CP/aop/src/main/java/org/jboss/aop/instrument/GeneratedAdvisorMethodExecutionTransformer.java
   projects/aop/branches/JBoss_AOP_2_1_6_GA_CP/aop/src/main/java/org/jboss/aop/instrument/NonOptimizedMethodExecutionTransformer.java
   projects/aop/branches/JBoss_AOP_2_1_6_GA_CP/aop/src/main/java/org/jboss/aop/instrument/OptimizedMethodExecutionTransformer.java
Log:
[JBAOP-811] Remove bridge flag from generated methods.

Modified: projects/aop/branches/JBoss_AOP_2_1_6_GA_CP/aop/src/main/java/org/jboss/aop/instrument/ClassicInstrumentor.java
===================================================================
--- projects/aop/branches/JBoss_AOP_2_1_6_GA_CP/aop/src/main/java/org/jboss/aop/instrument/ClassicInstrumentor.java	2012-02-28 04:11:10 UTC (rev 112703)
+++ projects/aop/branches/JBoss_AOP_2_1_6_GA_CP/aop/src/main/java/org/jboss/aop/instrument/ClassicInstrumentor.java	2012-02-28 04:57:21 UTC (rev 112704)
@@ -123,6 +123,10 @@
       {
          modifier &= ~AccessFlag.ABSTRACT; 
       }
+      if ((modifier & AccessFlag.BRIDGE) == AccessFlag.BRIDGE)
+      {
+         modifier &= ~AccessFlag.BRIDGE;
+      }
       nmethod.setModifiers(modifier);
       addSyntheticAttribute(nmethod);
       clazz.addMethod(nmethod);

Modified: projects/aop/branches/JBoss_AOP_2_1_6_GA_CP/aop/src/main/java/org/jboss/aop/instrument/GeneratedAdvisorMethodExecutionTransformer.java
===================================================================
--- projects/aop/branches/JBoss_AOP_2_1_6_GA_CP/aop/src/main/java/org/jboss/aop/instrument/GeneratedAdvisorMethodExecutionTransformer.java	2012-02-28 04:11:10 UTC (rev 112703)
+++ projects/aop/branches/JBoss_AOP_2_1_6_GA_CP/aop/src/main/java/org/jboss/aop/instrument/GeneratedAdvisorMethodExecutionTransformer.java	2012-02-28 04:57:21 UTC (rev 112704)
@@ -31,6 +31,7 @@
 import javassist.CtNewMethod;
 import javassist.Modifier;
 import javassist.NotFoundException;
+import javassist.bytecode.AccessFlag;
 
 /**
  * Used with GeneratedAdvisorInstrumentor
@@ -131,6 +132,11 @@
 
       String wrappedName = ClassAdvisor.notAdvisedMethodName(clazz.getName(), originalName);
       CtMethod wmethod = CtNewMethod.copy(original, clazz, null);
+      
+      //drop bridge flag if present
+      int modifier = wmethod.getModifiers();
+      modifier &= ~AccessFlag.BRIDGE;
+      wmethod.setModifiers(modifier);
 
       wmethod.setName(wrappedName);
       clazz.addMethod(wmethod);
@@ -229,6 +235,11 @@
 
       String wrappedName = ClassAdvisor.notAdvisedMethodName(clazz.getName(), originalName);
       CtMethod wmethod = CtNewMethod.copy(original, clazz, null);
+      
+      //drop bridge flag if present
+      int modifier = wmethod.getModifiers();
+      modifier &= ~AccessFlag.BRIDGE;
+      wmethod.setModifiers(modifier);
 
       wmethod.setName(wrappedName);
       clazz.addMethod(wmethod);
@@ -290,6 +301,11 @@
       String wrappedName = ClassAdvisor.notAdvisedMethodName(trans.getClazzName(),
                                                              trans.getMethod().getName());
       CtMethod wmethod = CtNewMethod.copy(trans.getMethod(), trans.getClazz(), null);
+      
+      //drop bridge flag if present
+      int modifier = wmethod.getModifiers();
+      modifier &= ~AccessFlag.BRIDGE;
+      wmethod.setModifiers(modifier);
 
       String originalName = trans.getOriginalName();
       wmethod.setName(wrappedName);

Modified: projects/aop/branches/JBoss_AOP_2_1_6_GA_CP/aop/src/main/java/org/jboss/aop/instrument/NonOptimizedMethodExecutionTransformer.java
===================================================================
--- projects/aop/branches/JBoss_AOP_2_1_6_GA_CP/aop/src/main/java/org/jboss/aop/instrument/NonOptimizedMethodExecutionTransformer.java	2012-02-28 04:11:10 UTC (rev 112703)
+++ projects/aop/branches/JBoss_AOP_2_1_6_GA_CP/aop/src/main/java/org/jboss/aop/instrument/NonOptimizedMethodExecutionTransformer.java	2012-02-28 04:57:21 UTC (rev 112704)
@@ -28,6 +28,7 @@
 import javassist.CtNewMethod;
 import javassist.Modifier;
 import javassist.NotFoundException;
+import javassist.bytecode.AccessFlag;
 
 /**
  * Comment
@@ -49,6 +50,11 @@
       String wrappedName = ClassAdvisor.notAdvisedMethodName(trans.getClazzName(),
                                                              trans.getMethod().getName());
       CtMethod wmethod = CtNewMethod.copy(trans.getMethod(), trans.getClazz(), null);
+      
+      //drop bridge flag if present
+      int modifier = wmethod.getModifiers();
+      modifier &= ~AccessFlag.BRIDGE;
+      wmethod.setModifiers(modifier);
 
       String originalName = trans.getOriginalName();
       wmethod.setName(wrappedName);

Modified: projects/aop/branches/JBoss_AOP_2_1_6_GA_CP/aop/src/main/java/org/jboss/aop/instrument/OptimizedMethodExecutionTransformer.java
===================================================================
--- projects/aop/branches/JBoss_AOP_2_1_6_GA_CP/aop/src/main/java/org/jboss/aop/instrument/OptimizedMethodExecutionTransformer.java	2012-02-28 04:11:10 UTC (rev 112703)
+++ projects/aop/branches/JBoss_AOP_2_1_6_GA_CP/aop/src/main/java/org/jboss/aop/instrument/OptimizedMethodExecutionTransformer.java	2012-02-28 04:57:21 UTC (rev 112704)
@@ -26,6 +26,7 @@
 import javassist.CtNewMethod;
 import javassist.Modifier;
 import javassist.NotFoundException;
+import javassist.bytecode.AccessFlag;
 
 import org.jboss.aop.ClassAdvisor;
 
@@ -50,6 +51,11 @@
       String wrappedName = ClassAdvisor.notAdvisedMethodName(trans.getClazzName(),
                                                              trans.getOriginalName());
       CtMethod wmethod = CtNewMethod.copy(trans.getMethod(), trans.getClazz(), null);
+      
+      //drop bridge flag if present
+      int modifier = wmethod.getModifiers();
+      modifier &= ~AccessFlag.BRIDGE;
+      wmethod.setModifiers(modifier);
 
       // generate Wrapper
       String originalName = trans.getOriginalName();