[jboss-cvs] JBossAS SVN: r62744 - branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/cache/tree.

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

Author: bstansberry at jboss.com
Date: 2007-05-02 12:25:12 -0400 (Wed, 02 May 2007)
New Revision: 62744

Modified:
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/cache/tree/StatefulTreeCache.java
Log:
Clean up hiding of instance field by param

Modified: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/cache/tree/StatefulTreeCache.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/cache/tree/StatefulTreeCache.java	2007-05-02 16:24:21 UTC (rev 62743)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/cache/tree/StatefulTreeCache.java	2007-05-02 16:25:12 UTC (rev 62744)
@@ -33,7 +33,6 @@
 import javax.management.MBeanServer;
 import javax.management.ObjectName;
 
-import org.jboss.aop.Advisor;
 import org.jboss.cache.xml.XmlHelper;
 import org.jboss.cache.eviction.RegionManager;
 import org.jboss.cache.eviction.Region;
@@ -44,10 +43,7 @@
 import org.jboss.cache.TreeCache;
 import org.jboss.cache.TreeCacheMBean;
 import org.jboss.ejb3.Container;
-import org.jboss.ejb3.DeploymentScope;
-import org.jboss.ejb3.DeploymentUnit;
 import org.jboss.ejb3.EJBContainer;
-import org.jboss.ejb3.Ejb3Deployment;
 import org.jboss.ejb3.Pool;
 import org.jboss.ejb3.cache.ClusteredStatefulCache;
 import org.jboss.ejb3.stateful.NestedStatefulBeanContext;
@@ -109,7 +105,7 @@
    protected RemovalTimeoutTask removalTask = null;
    protected boolean running = true;
    protected Map<Object, Long> beans = new ConcurrentHashMap<Object, Long>();
-   protected EJBContainer container;
+   protected EJBContainer ejbContainer;
 
    public StatefulBeanContext create()
    {
@@ -291,21 +287,21 @@
 
    public void initialize(Container container) throws Exception
    {
-      log = Logger.getLogger(getClass().getName() + "." + container.getEjbName());
+      this.ejbContainer = (EJBContainer) container;
       
-      this.container = (EJBContainer) container;
-      this.pool = container.getPool();
-      ClassLoader cl = this.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;
-      CacheConfig config = (CacheConfig) advisor.resolveAnnotation(CacheConfig.class);
+      CacheConfig config = (CacheConfig) this.ejbContainer.resolveAnnotation(CacheConfig.class);
       MBeanServer server = MBeanServerLocator.locateJBoss();
       ObjectName cacheON = new ObjectName(config.name());
       TreeCacheMBean mbean = (TreeCacheMBean) MBeanProxyExt.create(TreeCacheMBean.class, cacheON, server);
       cache = (TreeCache) mbean.getInstance();
       
-      cacheNode = new Fqn(new Object[] { this.container.getDeploymentQualifiedName() });
+      cacheNode = new Fqn(new Object[] { this.ejbContainer.getDeploymentQualifiedName() });
 
       // Try to create an eviction region per ejb
       evictRegionManager = cache.getEvictionRegionManager();
@@ -316,11 +312,11 @@
       cache.registerClassLoader(cacheNode.toString(), cl);
       cache.activateRegion(cacheNode.toString());
       
-      log.debug("initialize(): create eviction region: " +region + " for ejb: " +container.getEjbName());
+      log.debug("initialize(): create eviction 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 Element getElementConfig(String regionName, long timeToLiveSeconds, int maxNodes) throws Exception {