[jboss-cvs] JBossAS SVN: r62772 - trunk/ejb3/src/main/org/jboss/ejb3/cache/tree.

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

Author: bstansberry at jboss.com
Date: 2007-05-03 00:02:47 -0400 (Thu, 03 May 2007)
New Revision: 62772

Modified:
   trunk/ejb3/src/main/org/jboss/ejb3/cache/tree/StatefulTreeCache.java
Log:
[EJBTHREE-946] Segregate deployments based on a deployment-qualified ejb name

Modified: trunk/ejb3/src/main/org/jboss/ejb3/cache/tree/StatefulTreeCache.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/cache/tree/StatefulTreeCache.java	2007-05-03 03:57:19 UTC (rev 62771)
+++ trunk/ejb3/src/main/org/jboss/ejb3/cache/tree/StatefulTreeCache.java	2007-05-03 04:02:47 UTC (rev 62772)
@@ -104,7 +104,7 @@
    protected RemovalTimeoutTask removalTask = null;
    protected boolean running = true;
    protected Map<Object, Long> beans = new ConcurrentHashMap<Object, Long>();
-   protected Container container;
+   protected EJBContainer ejbContainer;
 
    public StatefulBeanContext create()
    {
@@ -284,21 +284,22 @@
 
    public void initialize(Container container) throws Exception
    {
-      log = Logger.getLogger(getClass().getName() + "." + container.getEjbName());
+      this.ejbContainer = (EJBContainer) container;
       
-      this.container = container;
-      this.pool = container.getPool();
-      ClassLoader cl = ((EJBContainer) container).getClassloader();
+      log = Logger.getLogger(getClass().getName() + "." + this.ejbContainer.getEjbName());
+            
+      this.pool = this.ejbContainer.getPool();
+      ClassLoader cl = this.ejbContainer.getClassloader();
       this.classloader = new WeakReference<ClassLoader>(cl);
       
-      Advisor advisor = (Advisor) container;
+      Advisor advisor = this.ejbContainer;
       CacheConfig config = (CacheConfig) advisor.resolveAnnotation(CacheConfig.class);
       MBeanServer server = MBeanServerLocator.locateJBoss();
       ObjectName cacheON = new ObjectName(config.name());
       CacheJmxWrapperMBean mbean = (CacheJmxWrapperMBean) MBeanProxyExt.create(CacheJmxWrapperMBean.class, cacheON, server);
       cache = mbean.getCache();
 
-      cacheNode = Fqn.fromString("/" + container.getEjbName() + "/");
+      cacheNode = new Fqn(new Object[] { this.ejbContainer.getDeploymentQualifiedName() });
 
       // Try to create an eviction region per ejb
       region = cache.getRegion(cacheNode, true);
@@ -310,11 +311,11 @@
       region.registerContextClassLoader(cl);
       region.activate();
       
-      log.debug("initialize(): created region: " +region + " for ejb: " +container.getEjbName());
+      log.debug("initialize(): created region: " +region + " for ejb: " + this.ejbContainer.getEjbName());
    
       removalTimeout = config.removalTimeoutSeconds();
       if (removalTimeout > 0)
-         removalTask = new RemovalTimeoutTask("SFSB Removal Thread - " + container.getObjectName().getCanonicalName());
+         removalTask = new RemovalTimeoutTask("SFSB Removal Thread - " + this.ejbContainer.getObjectName().getCanonicalName());
    }
    
    protected EvictionPolicyConfig getEvictionPolicyConfig(int timeToLiveSeconds, int maxNodes)