[jboss-cvs] JBossAS SVN: r59433 - in projects/aop/trunk/aop/src/main/org/jboss/aop: instrument pointcut standalone

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

Author: flavia.rainone at jboss.com
Date: 2007-01-09 07:36:26 -0500 (Tue, 09 Jan 2007)
New Revision: 59433

Modified:
   projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/Instrumentor.java
   projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/JoinpointFullClassifier.java
   projects/aop/trunk/aop/src/main/org/jboss/aop/pointcut/PointcutInfo.java
   projects/aop/trunk/aop/src/main/org/jboss/aop/standalone/InstrumentationAdapter.java
Log:
Fix most of the hot swap test errors

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	2007-01-09 12:26:45 UTC (rev 59432)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/Instrumentor.java	2007-01-09 12:36:26 UTC (rev 59433)
@@ -630,15 +630,11 @@
    public boolean transform(CtClass clazz,
                             ClassAdvisor advisor)
    {
-      synchronized(this.processedClasses)
-      {
-         processedClasses.add(clazz);
-      }
       try
       {
          if (shouldNotTransform(clazz)) return false;
          if (AspectManager.verbose) System.out.println("[trying to transform] " + clazz.getName());
-
+         
          DeclareChecker.checkDeclares(manager, clazz, advisor);
 
          boolean converted = instrumentAnnotationIntroductions(clazz, advisor);
@@ -689,6 +685,11 @@
          // notifies dynamic transformation observer
          dynamicTransformationObserver.transformationFinished(clazz, converter);
 
+         synchronized(this.processedClasses)
+         {
+            processedClasses.add(clazz);
+         }
+         
          if (AspectManager.verbose) System.out.println("[debug] was " + clazz.getName() + " converted: " + (basicsSet || converted));
 
          if (basicsSet || converted)

Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/JoinpointFullClassifier.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/JoinpointFullClassifier.java	2007-01-09 12:26:45 UTC (rev 59432)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/JoinpointFullClassifier.java	2007-01-09 12:36:26 UTC (rev 59433)
@@ -78,6 +78,10 @@
             else if (pointcutInfo.isDynamicAop())
             {
                classification = JoinpointClassification.DYNAMICALY_WRAPPED;
+               synchronized (pointcutInfo)
+               {
+                  pointcutInfo.setDynamicAop(false);
+               }
             } 
             else
             {

Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/pointcut/PointcutInfo.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/pointcut/PointcutInfo.java	2007-01-09 12:26:45 UTC (rev 59432)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/pointcut/PointcutInfo.java	2007-01-09 12:36:26 UTC (rev 59433)
@@ -90,4 +90,9 @@
    {
       return this.dynamicAop;
    }
+   
+   public void setDynamicAop(boolean ok)
+   {
+      this.dynamicAop = ok;
+   }
 }
\ No newline at end of file

Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/standalone/InstrumentationAdapter.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/standalone/InstrumentationAdapter.java	2007-01-09 12:26:45 UTC (rev 59432)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/standalone/InstrumentationAdapter.java	2007-01-09 12:36:26 UTC (rev 59433)
@@ -83,6 +83,9 @@
       {
          throw new RuntimeException(e);
       }
-      this.classDefinitions.clear();
+      finally
+      {
+         this.classDefinitions.clear();
+      }
    }
 }
\ No newline at end of file