[jboss-cvs] JBossAS SVN: r84629 - projects/aop/branches/createspi/aop/src/main/java/org/jboss/aop.

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

Author: kabir.khan at jboss.com
Date: 2009-02-23 09:35:40 -0500 (Mon, 23 Feb 2009)
New Revision: 84629

Modified:
   projects/aop/branches/createspi/aop/src/main/java/org/jboss/aop/Domain.java
Log:
Avoid infinite recursion in Domain

Modified: projects/aop/branches/createspi/aop/src/main/java/org/jboss/aop/Domain.java
===================================================================
--- projects/aop/branches/createspi/aop/src/main/java/org/jboss/aop/Domain.java	2009-02-23 14:03:07 UTC (rev 84628)
+++ projects/aop/branches/createspi/aop/src/main/java/org/jboss/aop/Domain.java	2009-02-23 14:35:40 UTC (rev 84629)
@@ -406,17 +406,17 @@
          {
             // when child first, parent bindings go in first so that they can be overridden by child.
             map.putAll(parent.getInterfaceIntroductions());
-            synchronized (getInterfaceIntroductions())
+            synchronized (super.getInterfaceIntroductions())
             {
-               map.putAll(getInterfaceIntroductions());
+               map.putAll(super.getInterfaceIntroductions());
             }
             return map;
          }
          else
          {
-            synchronized (getInterfaceIntroductions())
+            synchronized (super.getInterfaceIntroductions())
             {
-               map.putAll(getInterfaceIntroductions());
+               map.putAll(super.getInterfaceIntroductions());
             }
             map.putAll(parent.getInterfaceIntroductions());
             return map;
@@ -454,17 +454,17 @@
          {
             // when child first, parent bindings go in first so that they can be overridden by child.
             map.putAll(parent.getTypedefs());
-            synchronized (getTypedefs())
+            synchronized (super.getTypedefs())
             {
-               map.putAll(getTypedefs());
+               map.putAll(super.getTypedefs());
             }
             return map;
          }
          else
          {
-            synchronized (getTypedefs())
+            synchronized (super.getTypedefs())
             {
-               map.putAll(getTypedefs());
+               map.putAll(super.getTypedefs());
             }
             map.putAll(parent.getTypedefs());
             return map;
@@ -563,7 +563,7 @@
             //TODO necessary locking?
 //            synchronized (cflowStacks)
 //            {
-               map.putAll(getCflowStacks());
+               map.putAll(super.getCflowStacks());
 //            }
             return map;
          }
@@ -572,7 +572,7 @@
             //TODO necessary locking?
 //            synchronized (cflowStacks)
 //            {
-               map.putAll(getCflowStacks());
+               map.putAll(super.getCflowStacks());
 //            }
             map.putAll(parent.getCflowStacks());
             return map;
@@ -591,17 +591,17 @@
          {
             // when child first, parent bindings go in first so that they can be overridden by child.
             map.putAll(parent.getDynamicCFlows());
-            synchronized (getDynamicCFlows())
+            synchronized (super.getDynamicCFlows())
             {
-               map.putAll(getDynamicCFlows());
+               map.putAll(super.getDynamicCFlows());
             }
             return map;
          }
          else
          {
-            synchronized (getDynamicCFlows())
+            synchronized (super.getDynamicCFlows())
             {
-               map.putAll(getDynamicCFlows());
+               map.putAll(super.getDynamicCFlows());
             }
             map.putAll(parent.getDynamicCFlows());
             return map;