[jboss-cvs] JBossAS SVN: r102820 - in projects/aop/trunk: aop/src/main/java/org/jboss/aop/instrument and 2 other directories.

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

Author: flavia.rainone at jboss.com
Date: 2010-03-23 15:52:07 -0400 (Tue, 23 Mar 2010)
New Revision: 102820

Modified:
   projects/aop/trunk/aop/src/main/java/org/jboss/aop/AspectManager.java
   projects/aop/trunk/aop/src/main/java/org/jboss/aop/instrument/OptimizedInvocations.java
   projects/aop/trunk/asintegration-mc/src/main/java/org/jboss/aop/asintegration/jboss5/JBoss5Integration.java
   projects/aop/trunk/asintegration-mc/src/test/java/org/jboss/test/classpool/jbosscl/test/JBossClClassPoolTestDelegate.java
Log:
[JBAOP-772] Some cleanup.

Modified: projects/aop/trunk/aop/src/main/java/org/jboss/aop/AspectManager.java
===================================================================
--- projects/aop/trunk/aop/src/main/java/org/jboss/aop/AspectManager.java	2010-03-23 19:48:30 UTC (rev 102819)
+++ projects/aop/trunk/aop/src/main/java/org/jboss/aop/AspectManager.java	2010-03-23 19:52:07 UTC (rev 102820)
@@ -547,7 +547,7 @@
             WeakReference<Domain> ref = domainsMap.get(clazz);
             if (ref != null)
             {
-               Domain subDomain = ref.get();  
+               Domain subDomain = ref.get();
                if(subDomain != null)
                {
                   WeakReference<Advisor> advisorRef = subDomain.advisors.get(clazz);
@@ -908,7 +908,6 @@
    public void unregisterClassLoader(ClassLoader cl)
    {
       ClassPoolRepository.getInstance().unregisterClassLoader(cl);
-
    }
 
    public ArrayList<String> getExclude()

Modified: projects/aop/trunk/aop/src/main/java/org/jboss/aop/instrument/OptimizedInvocations.java
===================================================================
--- projects/aop/trunk/aop/src/main/java/org/jboss/aop/instrument/OptimizedInvocations.java	2010-03-23 19:48:30 UTC (rev 102819)
+++ projects/aop/trunk/aop/src/main/java/org/jboss/aop/instrument/OptimizedInvocations.java	2010-03-23 19:52:07 UTC (rev 102820)
@@ -41,7 +41,7 @@
    {
       //In some cases we get a class frozen exception. I guess if the invocation class 
       //existed, method was unwrapped and the wrapped again
-      // TODO I replaced getCached by get
+      // I replaced getCached by get (JBAOP-772)
       try
       {
          CtClass existing = pool.getCtClass(className);

Modified: projects/aop/trunk/asintegration-mc/src/main/java/org/jboss/aop/asintegration/jboss5/JBoss5Integration.java
===================================================================
--- projects/aop/trunk/asintegration-mc/src/main/java/org/jboss/aop/asintegration/jboss5/JBoss5Integration.java	2010-03-23 19:48:30 UTC (rev 102819)
+++ projects/aop/trunk/asintegration-mc/src/main/java/org/jboss/aop/asintegration/jboss5/JBoss5Integration.java	2010-03-23 19:52:07 UTC (rev 102820)
@@ -133,8 +133,7 @@
       if (factory instanceof AbstractClassPoolFactory)
       {
          ClassPoolRepository.getInstance().setClassPoolFactory((AbstractClassPoolFactory) factory);
-         //AOPClassPoolFactory.setDelegateClassPoolFactory();
-         this.delegateClassPoolFactory = factory;//new AOPClassPoolFactory();
+         this.delegateClassPoolFactory = factory;
       }
       else
       {

Modified: projects/aop/trunk/asintegration-mc/src/test/java/org/jboss/test/classpool/jbosscl/test/JBossClClassPoolTestDelegate.java
===================================================================
--- projects/aop/trunk/asintegration-mc/src/test/java/org/jboss/test/classpool/jbosscl/test/JBossClClassPoolTestDelegate.java	2010-03-23 19:48:30 UTC (rev 102819)
+++ projects/aop/trunk/asintegration-mc/src/test/java/org/jboss/test/classpool/jbosscl/test/JBossClClassPoolTestDelegate.java	2010-03-23 19:52:07 UTC (rev 102820)
@@ -46,6 +46,7 @@
       //ClassPoolRepository.getInstance().setClassPoolFactory(new AOPClassPoolFactory());
       //AOPClassPoolFactory.setDelegateClassPoolFactory(new JBossClDelegatingClassPoolFactory(domainRegistry, new RegisterModuleCallback(domainRegistry)));
    }
+
    public JBossClClassPoolTestDelegate(Class<?> clazz) throws Exception
    {
       super(clazz);