[jboss-cvs] JBossAS SVN: r70053 - in projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3: cache/tree and 1 other directory.

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

Author: bdecoste
Date: 2008-02-24 23:00:14 -0500 (Sun, 24 Feb 2008)
New Revision: 70053

Modified:
   projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/EJBContainer.java
   projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/cache/tree/StatefulTreeCache.java
Log:
tree cache needs container's object name's getCanonicalKeyPropertyListString not CanonicalName for cacheNode - don't want a : in a File

Modified: projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/EJBContainer.java
===================================================================
--- projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/EJBContainer.java	2008-02-25 01:05:39 UTC (rev 70052)
+++ projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/EJBContainer.java	2008-02-25 04:00:14 UTC (rev 70053)
@@ -351,6 +351,11 @@
       return businessInterfaces;
    }
       
+   public String getDeploymentQualifiedName()
+   {
+      return objectName.getCanonicalName();
+   }
+   
    /**
     * Returns a String identifier for this bean that is qualified by the
     * deployment, and hence should be unique across deployments. Name is of the 
@@ -358,9 +363,9 @@
     * returned by {@link #getEjbName()}. The "ear=foo.ear" portion is ommitted 
     * if the bean is not packaged in an ear.
     */
-   public String getDeploymentQualifiedName()
+   public String getDeploymentPropertyListString()
    {
-      return objectName.getCanonicalName();
+      return objectName.getCanonicalKeyPropertyListString();
    }
    
    public DeploymentUnit getDeploymentUnit()

Modified: projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/cache/tree/StatefulTreeCache.java
===================================================================
--- projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/cache/tree/StatefulTreeCache.java	2008-02-25 01:05:39 UTC (rev 70052)
+++ projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/cache/tree/StatefulTreeCache.java	2008-02-25 04:00:14 UTC (rev 70053)
@@ -325,8 +325,8 @@
       CacheJmxWrapperMBean mbean = (CacheJmxWrapperMBean) MBeanProxyExt.create(CacheJmxWrapperMBean.class, cacheON, server);
       cache = mbean.getCache();
 
-      cacheNode = new Fqn(new Object[] { this.ejbContainer.getDeploymentQualifiedName() });
-
+      cacheNode = new Fqn(new Object[] { this.ejbContainer.getDeploymentPropertyListString() });
+      
       // Try to create an eviction region per ejb
       region = cache.getRegion(cacheNode, true);
       EvictionPolicyConfig epc = getEvictionPolicyConfig((int) config.idleTimeoutSeconds(),
@@ -576,7 +576,7 @@
          }
 
          --passivatedCount;
-
+       
          if(log.isTraceEnabled())
          {
             log.trace("nodeLoaded(): send postActivate event to bean at fqn: " +fqn);
@@ -637,7 +637,7 @@
                }
 
                bean.passivateAfterReplication();
-                  ++passivatedCount;
+               ++passivatedCount;
             }
          }
          catch (NoSuchEJBException e)