[jboss-cvs] JBossAS SVN: r72907 - projects/aop/trunk/aop/src/main/org/jboss/aop/instrument.

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

Author: flavia.rainone at jboss.com
Date: 2008-05-01 00:27:31 -0400 (Thu, 01 May 2008)
New Revision: 72907

Modified:
   projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/JoinPointGenerator.java
Log:
[JBAOP-568] The reference to AdviceMethodProperties has been replaced by a references to AroundCFlow instances.

Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/JoinPointGenerator.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/JoinPointGenerator.java	2008-05-01 00:15:54 UTC (rev 72906)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/JoinPointGenerator.java	2008-05-01 04:27:31 UTC (rev 72907)
@@ -353,14 +353,14 @@
 //         }
          throw new RuntimeException(debugClass(sb, clazz).toString(), e);
       }
-      AdviceSetup[] aroundSetups = generatedClass.getAroundSetups();
-      for (int i = 0 ; i < aroundSetups.length ; i++)
+      AroundCFlow[] aroundCFlows = generatedClass.getAroundCFlows();
+      if (aroundCFlows != null)
       {
-         if (aroundSetups[i].isNewCFlow())
+         for (int i = 0 ; i < aroundCFlows.length ; i++)
          {
-            Field field = clazz.getDeclaredField("cflow" + aroundSetups[i].useCFlowFrom());
+            Field field = clazz.getDeclaredField(aroundCFlows[i].getFieldName());
             field.setAccessible(true);
-            field.set(obj, aroundSetups[i].getCFlow());
+            field.set(obj, aroundCFlows[i].getCflowExpression());
          }
       }
       return obj;
@@ -1509,17 +1509,64 @@
       }
    }
    
+   private static class AroundCFlow
+   {
+      private String fieldName;
+      private ASTCFlowExpression cflowExpression;
+      
+      public AroundCFlow(String fieldName, ASTCFlowExpression cflowEXpression)
+      {
+         this.fieldName = fieldName;
+         this.cflowExpression = cflowEXpression;
+      }
+      
+      public String getFieldName()
+      {
+         return this.fieldName;
+      }
+      
+      public ASTCFlowExpression getCflowExpression()
+      {
+         return cflowExpression;
+      }
+   }
+   
    private class GeneratedClassInfo
    {
       WeakReference<Class<?>> generated;
       String generatedName;
-      AdviceSetup[] aroundSetups;
+      AroundCFlow[] aroundCFlows;
       
       GeneratedClassInfo(Class<?> generated, AdviceSetups setups)
       {
          this.generated = new WeakReference<Class<?>>(generated);
          this.generatedName = generated.getName();
-         this.aroundSetups = setups.getByType(AdviceType.AROUND);
+         AdviceSetup[] aroundSetups = setups.getByType(AdviceType.AROUND);
+         int size = 0;
+         if (aroundSetups != null)
+         {
+            for (int i = 0; i < aroundSetups.length; i++)
+            {
+               if (aroundSetups[i].isNewCFlow())
+               {
+                  size++;
+               }
+            }
+         }
+         if (size > 0)
+         {
+            aroundCFlows = new AroundCFlow[size];
+            int j = 0;
+            for (int i = 0; i < aroundSetups.length; i++)
+            {
+               if (aroundSetups[i].isNewCFlow())
+               {
+                  aroundCFlows[j++] = new AroundCFlow(
+                        "cflow" + aroundSetups[i].useCFlowFrom(),
+                        aroundSetups[i].getCFlow());
+               }
+            }
+         }
       }
       
       Class<?> getGenerated(ClassLoader classloader)
@@ -1540,9 +1587,9 @@
          return generatedClass;
       }
       
-      AdviceSetup[] getAroundSetups()
+      AroundCFlow[] getAroundCFlows()
       {
-         return (aroundSetups == null) ? new AdviceSetup[0] : aroundSetups;
+         return aroundCFlows;
       }
    }