[jboss-cvs] JBossAS SVN: r78892 - projects/aop/trunk/asintegration-core/src/main/org/jboss/aop/asintegration/core.

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

Author: kabir.khan at jboss.com
Date: 2008-09-26 10:48:20 -0400 (Fri, 26 Sep 2008)
New Revision: 78892

Modified:
   projects/aop/trunk/asintegration-core/src/main/org/jboss/aop/asintegration/core/AspectManagerServiceDelegate.java
Log:
[JBAOP-647] Fix bug when starting with useBaseAspects=true

Modified: projects/aop/trunk/asintegration-core/src/main/org/jboss/aop/asintegration/core/AspectManagerServiceDelegate.java
===================================================================
--- projects/aop/trunk/asintegration-core/src/main/org/jboss/aop/asintegration/core/AspectManagerServiceDelegate.java	2008-09-26 14:46:47 UTC (rev 78891)
+++ projects/aop/trunk/asintegration-core/src/main/org/jboss/aop/asintegration/core/AspectManagerServiceDelegate.java	2008-09-26 14:48:20 UTC (rev 78892)
@@ -77,14 +77,6 @@
       Class<?> clazz = TransformerCommon.class;
       clazz = SuperClassesFirstWeavingStrategy.class;
       clazz = ClassicWeavingStrategy.class;
-      try
-      {
-         //FIXME Move out to where the RepositoryClassLoader is initialised 
-         clazz = Class.forName("org.jboss.mx.loading.HeirarchicalLoaderRepository3");
-      }
-      catch (ClassNotFoundException e)
-      {
-      }
    }
 
    // Attributes ---------------------------------------------------
@@ -599,17 +591,20 @@
     */
    public synchronized void setUseBaseXml(boolean useBaseXml)
    {
-      if (started && useBaseXml != this.useBaseXml)
+      if (useBaseXml != this.useBaseXml)
       {
          this.useBaseXml = useBaseXml;
-         if (useBaseXml)
+         if (started)
          {
-            deployBaseXml();
+            if (useBaseXml)
+            {
+               deployBaseXml();
+            }
+            else
+            {
+               undeployBaseXml();
+            }
          }
-         else
-         {
-            undeployBaseXml();
-         }
       }
    }