[jboss-cvs] JBossAS SVN: r77617 - in projects/aop/trunk/aop/src: test/org/jboss/test/aop/rebuildingchain and 1 other directory.

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

Author: flavia.rainone at jboss.com
Date: 2008-08-28 14:48:12 -0400 (Thu, 28 Aug 2008)
New Revision: 77617

Modified:
   projects/aop/trunk/aop/src/main/org/jboss/aop/AspectManager.java
   projects/aop/trunk/aop/src/test/org/jboss/test/aop/rebuildingchain/RebuildingChainTestCase.java
Log:
[JBAOP-569] Bug fixed by synchronized AspectManager.removeBinding method.

Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/AspectManager.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/AspectManager.java	2008-08-28 18:29:28 UTC (rev 77616)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/AspectManager.java	2008-08-28 18:48:12 UTC (rev 77617)
@@ -1390,7 +1390,7 @@
    /**
     * Remove an interceptor pointcut with a given name
     */
-   public void removeBinding(String name)
+   public synchronized void removeBinding(String name)
    {
       AdviceBinding binding = internalRemoveBinding(name);
       if (binding != null)

Modified: projects/aop/trunk/aop/src/test/org/jboss/test/aop/rebuildingchain/RebuildingChainTestCase.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/rebuildingchain/RebuildingChainTestCase.java	2008-08-28 18:29:28 UTC (rev 77616)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/rebuildingchain/RebuildingChainTestCase.java	2008-08-28 18:48:12 UTC (rev 77617)
@@ -223,8 +223,7 @@
       
       st.setDone(true);
       rt.setDone(true);
-      // TODO remove this when JBAOP-569 is fixed
-      //rt.unlinkAdvice();
+      rt.unlinkAdvice();
       
       assertFalse("Failed to match pointcut when rebuilding the chain....", failed);
    }