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

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

Author: bstansberry at jboss.com
Date: 2007-01-11 21:35:27 -0500 (Thu, 11 Jan 2007)
New Revision: 59562

Modified:
   trunk/ejb3/src/main/org/jboss/ejb3/cache/tree/StatefulTreeCache.java
Log:
Move to JBoss Cache Alpha2
Use toString() form of bean id in Fqn

Modified: trunk/ejb3/src/main/org/jboss/ejb3/cache/tree/StatefulTreeCache.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/cache/tree/StatefulTreeCache.java	2007-01-12 02:35:02 UTC (rev 59561)
+++ trunk/ejb3/src/main/org/jboss/ejb3/cache/tree/StatefulTreeCache.java	2007-01-12 02:35:27 UTC (rev 59562)
@@ -83,7 +83,7 @@
       try
       {
          ctx = (StatefulBeanContext) pool.get();
-         cache.put(new Fqn(cacheNode, ctx.getId()), "bean", ctx);
+         cache.put(new Fqn(cacheNode, ctx.getId().toString()), "bean", ctx);
          ctx.inUse = true;
          ctx.lastUsed = System.currentTimeMillis();
       }
@@ -104,7 +104,7 @@
       try
       {
          ctx = (StatefulBeanContext) pool.get(initTypes, initValues);
-         Fqn id = new Fqn(cacheNode, ctx.getId());
+         Fqn id = new Fqn(cacheNode, ctx.getId().toString());
          cache.put(id, "bean", ctx);
          ctx.inUse = true;
          ctx.lastUsed = System.currentTimeMillis();
@@ -123,7 +123,7 @@
    public StatefulBeanContext get(Object key) throws EJBException
    {
       StatefulBeanContext entry = null;
-      Fqn id = new Fqn(cacheNode, key);
+      Fqn id = new Fqn(cacheNode, key.toString());
       try
       {
          Object obj = cache.get(id, "bean");
@@ -140,7 +140,7 @@
       entry.inUse = true;
       // Mark it to eviction thread that don't passivate it yet.
       // Note the Fqn we use is relative to the region!
-      region.markNodeCurrentlyInUse(new Fqn(key), MarkInUseWaitTime);
+      region.markNodeCurrentlyInUse(new Fqn(key.toString()), MarkInUseWaitTime);
       if(log.isDebugEnabled())
       {
          log.debug("get: retrieved bean with cache id " +id.toString());
@@ -152,7 +152,7 @@
 
    public void remove(Object key)
    {
-      Fqn id = new Fqn(cacheNode, key);
+      Fqn id = new Fqn(cacheNode, key.toString());
       try
       {
          if(log.isDebugEnabled())
@@ -175,7 +175,7 @@
          ctx.lastUsed = System.currentTimeMillis();
          // OK, it is free to passivate now.
          // Note the Fqn we use is relative to the region!
-         region.unmarkNodeCurrentlyInUse(new Fqn(ctx.getId()));
+         region.unmarkNodeCurrentlyInUse(new Fqn(ctx.getId().toString()));
       }
    }
 
@@ -183,7 +183,7 @@
    {
       try
       {
-         cache.put(new Fqn(cacheNode, ctx.getId()), "bean", ctx);
+         cache.put(new Fqn(cacheNode, ctx.getId().toString()), "bean", ctx);
       }
       catch (CacheException e)
       {