[jboss-cvs] JBossAS SVN: r72319 - trunk/tomcat/src/main/org/jboss/web/tomcat/service/session.

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

Author: bstansberry at jboss.com
Date: 2008-04-16 18:22:44 -0400 (Wed, 16 Apr 2008)
New Revision: 72319

Modified:
   trunk/tomcat/src/main/org/jboss/web/tomcat/service/session/JBossCacheService.java
Log:
[JBAS-4632] Remove JBCACHE-1172 workaround

Modified: trunk/tomcat/src/main/org/jboss/web/tomcat/service/session/JBossCacheService.java
===================================================================
--- trunk/tomcat/src/main/org/jboss/web/tomcat/service/session/JBossCacheService.java	2008-04-16 21:26:01 UTC (rev 72318)
+++ trunk/tomcat/src/main/org/jboss/web/tomcat/service/session/JBossCacheService.java	2008-04-16 22:22:44 UTC (rev 72319)
@@ -536,8 +536,6 @@
 
    /**
     * Return all attributes associated with this session id.
-    *
-    * TODO use Node.getData() and just copy the map
     * 
     * @param realId the session id with any jvmRoute removed
     * @return the attributes, or any empty Map if none are found.
@@ -547,28 +545,10 @@
       if (realId == null || realId.length() == 0) return new HashMap();
       
       Map attrs = new HashMap();
-//      Set set = getAttributeKeys(realId);
-//      if(set != null)
-//      {
-//         for (Iterator it = set.iterator(); it.hasNext();)
-//         {
-//            String key = (String) it.next();
-//            Object value = getAttribute(realId, key);
-//            map.put(key, value);
-//         }
-//      }
       Fqn fqn = getAttributeFqn(realId);
       
       Node node = plainCache_.getRoot().getChild(fqn);
       Map rawData = node.getData();
-
-      // FIXME Next block is a hack to work around JBCACHE-1172
-      // by forcing a load of data from the cache loader
-      if (rawData.size() == 0)
-      {
-         plainCache_.get(fqn, new Object());
-         rawData = node.getData();
-      }
       
       for (Iterator it = rawData.entrySet().iterator(); it.hasNext();)
       {