[Jboss-cvs] JBossAS SVN: r55946 - in trunk/ejb3/src/main/org/jboss: ejb3 injection

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

Author: wolfc
Date: 2006-08-15 08:52:33 -0400 (Tue, 15 Aug 2006)
New Revision: 55946

Modified:
   trunk/ejb3/src/main/org/jboss/ejb3/JmxKernelAbstraction.java
   trunk/ejb3/src/main/org/jboss/injection/EJBHandler.java
Log:
prevent self dependency

Modified: trunk/ejb3/src/main/org/jboss/ejb3/JmxKernelAbstraction.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/JmxKernelAbstraction.java	2006-08-15 11:24:28 UTC (rev 55945)
+++ trunk/ejb3/src/main/org/jboss/ejb3/JmxKernelAbstraction.java	2006-08-15 12:52:33 UTC (rev 55946)
@@ -82,6 +82,10 @@
             log.info("\t" + obj);
          }
          ObjectName on = new ObjectName(name);
+         
+         if(policy.getDependencies().contains(on))
+            throw new IllegalStateException("circular dependencies detected");
+         
          server.registerMBean(service, on);
          addParentDependency(on);
 

Modified: trunk/ejb3/src/main/org/jboss/injection/EJBHandler.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/injection/EJBHandler.java	2006-08-15 11:24:28 UTC (rev 55945)
+++ trunk/ejb3/src/main/org/jboss/injection/EJBHandler.java	2006-08-15 12:52:33 UTC (rev 55946)
@@ -50,7 +50,9 @@
 
    protected void addDependency(String refName, EJBContainer refcon, InjectionContainer container)
    {
-      container.getDependencyPolicy().addDependency(refcon.getObjectName().getCanonicalName());
+      // Do not depend on myself
+      if(!container.equals(refcon))
+         container.getDependencyPolicy().addDependency(refcon.getObjectName().getCanonicalName());
    }
 
    public void loadXml(EnvironmentRefGroup xml, InjectionContainer container)