[Jboss-cvs] JBossAS SVN: r56426 - branches/Branch_4_0/tomcat/src/main/org/jboss/web/tomcat/tc5/session

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

Author: bstansberry at jboss.com
Date: 2006-08-29 23:22:43 -0400 (Tue, 29 Aug 2006)
New Revision: 56426

Modified:
   branches/Branch_4_0/tomcat/src/main/org/jboss/web/tomcat/tc5/session/JBossCacheService.java
Log:
Minor code style stuff

Modified: branches/Branch_4_0/tomcat/src/main/org/jboss/web/tomcat/tc5/session/JBossCacheService.java
===================================================================
--- branches/Branch_4_0/tomcat/src/main/org/jboss/web/tomcat/tc5/session/JBossCacheService.java	2006-08-30 00:27:42 UTC (rev 56425)
+++ branches/Branch_4_0/tomcat/src/main/org/jboss/web/tomcat/tc5/session/JBossCacheService.java	2006-08-30 03:22:43 UTC (rev 56426)
@@ -669,30 +669,26 @@
       {
          Collection col = (Collection)pojo;
          for (Iterator i = col.iterator(); i.hasNext();) {
-            Object obj = i.next();
             // If not a managed pojo, will return anyway
-            addObserver(session, obj, processed);
+            addObserver(session, i.next(), processed);
          }
 
          return;
       } 
       else if (pojo instanceof Map)
       {
-         Map map = (Map)pojo;
-         for (Iterator i = map.keySet().iterator(); i.hasNext();) {
-            Object key = i.next();
-            Object value = map.get(key);
+         for (Iterator i = ((Map)pojo).entrySet().iterator(); i.hasNext();) 
+         {
+            Map.Entry entry = (Map.Entry) i.next();
 
             // Walk thru key and value
-            addObserver(session, key, processed);
-            addObserver(session, value, processed);
+            addObserver(session, entry.getKey(), processed);
+            addObserver(session, entry.getValue(), processed);
          }
 
          return;
       }
 
-      // BRIAN 3/14 changed this from checking Advised to checking Subject
-      // since that is what we cast to below
       if(! (pojo instanceof Subject) )
       {
          return;  // No need to add observer since it is primitive.