[jboss-cvs] JBossAS SVN: r78778 - trunk/server/src/main/org/jboss/ejb.

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

Author: emuckenhuber
Date: 2008-09-23 04:29:10 -0400 (Tue, 23 Sep 2008)
New Revision: 78778

Modified:
   trunk/server/src/main/org/jboss/ejb/EntityContainer.java
   trunk/server/src/main/org/jboss/ejb/SessionContainer.java
   trunk/server/src/main/org/jboss/ejb/StatefulSessionContainer.java
Log:
[JBAS-5332] set container on create

Modified: trunk/server/src/main/org/jboss/ejb/EntityContainer.java
===================================================================
--- trunk/server/src/main/org/jboss/ejb/EntityContainer.java	2008-09-23 08:23:06 UTC (rev 78777)
+++ trunk/server/src/main/org/jboss/ejb/EntityContainer.java	2008-09-23 08:29:10 UTC (rev 78778)
@@ -155,7 +155,6 @@
          throw new IllegalArgumentException("Null pool");
 
       this.instancePool = ip;
-      ip.setContainer(this);
    }
 
    public InstancePool getInstancePool()
@@ -169,7 +168,6 @@
          throw new IllegalArgumentException("Null cache");
 
       this.instanceCache = ic;
-      ic.setContainer(this);
    }
 
    public InstanceCache getInstanceCache()
@@ -188,7 +186,6 @@
          throw new IllegalArgumentException("Null persistence manager");
 
       persistenceManager = pm;
-      pm.setContainer(this);
    }
 
    public void addInterceptor(Interceptor in)
@@ -283,6 +280,7 @@
             log.debug("Failed to register cache as mbean", t);
          }
          // Initialize pool
+         instancePool.setContainer(this);
          instancePool.create();
 
          for (Iterator it = proxyFactories.keySet().iterator(); it.hasNext(); )
@@ -306,9 +304,11 @@
             log.debug("Failed to register cache as mbean", t);
          }
          // Init instance cache
+         instanceCache.setContainer(this);
          instanceCache.create();
 
          // Init persistence
+         persistenceManager.setContainer(this);
          persistenceManager.create();
 
          // Initialize the interceptor by calling the chain
@@ -347,7 +347,7 @@
             EJBProxyFactory ci = (EJBProxyFactory)proxyFactories.get(invokerBinding);
             ci.start();
          }
-
+         
          // Start instance cache
          instanceCache.start();
 
@@ -394,7 +394,6 @@
          // Stop the instance pool
          instancePool.stop();
 
-
          // Stop persistence
          persistenceManager.stop();
 

Modified: trunk/server/src/main/org/jboss/ejb/SessionContainer.java
===================================================================
--- trunk/server/src/main/org/jboss/ejb/SessionContainer.java	2008-09-23 08:23:06 UTC (rev 78777)
+++ trunk/server/src/main/org/jboss/ejb/SessionContainer.java	2008-09-23 08:29:10 UTC (rev 78778)
@@ -89,7 +89,6 @@
          throw new IllegalArgumentException("Null pool");
 
       this.instancePool = ip;
-      ip.setContainer(this);
    }
 
    /** return instance pool */
@@ -343,6 +342,7 @@
          log.debug("Failed to register pool as mbean", t);
       }
       // Initialize pool
+      instancePool.setContainer(this);
       instancePool.create();
    }
 
@@ -613,7 +613,6 @@
          String invokerBinding = (String) it.next();
          EJBProxyFactory ci = (EJBProxyFactory) proxyFactories.get(invokerBinding);
          ci.destroy();
-         ci.setContainer(null);
       }
    }
 

Modified: trunk/server/src/main/org/jboss/ejb/StatefulSessionContainer.java
===================================================================
--- trunk/server/src/main/org/jboss/ejb/StatefulSessionContainer.java	2008-09-23 08:23:06 UTC (rev 78777)
+++ trunk/server/src/main/org/jboss/ejb/StatefulSessionContainer.java	2008-09-23 08:29:10 UTC (rev 78778)
@@ -75,7 +75,6 @@
    public void setInstanceCache(InstanceCache ic)
    {
       this.instanceCache = ic;
-      ic.setContainer(this);
    }
 
    public InstanceCache getInstanceCache()
@@ -91,7 +90,6 @@
    public void setPersistenceManager(StatefulSessionPersistenceManager pm)
    {
       persistenceManager = pm;
-      pm.setContainer(this);
    }
 
    /**
@@ -157,6 +155,7 @@
          log.debug("Failed to register cache as mbean", t);
       }
       // Init instance cache
+      instanceCache.setContainer(this);
       instanceCache.create();
    }
 
@@ -165,6 +164,7 @@
     */
    protected void createPersistenceManager() throws Exception
    {
+      persistenceManager.setContainer(this);
       persistenceManager.create();
    }