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

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

Author: bstansberry at jboss.com
Date: 2008-11-10 22:14:03 -0500 (Mon, 10 Nov 2008)
New Revision: 80778

Modified:
   trunk/tomcat/src/main/org/jboss/web/tomcat/service/session/JBossCacheManager.java
Log:
Remove generics warns
Minor logging improvements

Modified: trunk/tomcat/src/main/org/jboss/web/tomcat/service/session/JBossCacheManager.java
===================================================================
--- trunk/tomcat/src/main/org/jboss/web/tomcat/service/session/JBossCacheManager.java	2008-11-11 03:09:14 UTC (rev 80777)
+++ trunk/tomcat/src/main/org/jboss/web/tomcat/service/session/JBossCacheManager.java	2008-11-11 03:14:03 UTC (rev 80778)
@@ -516,14 +516,14 @@
       if(unloadedSessions_.size() > 0)
       {
          // Make a thread-safe copy of the new id list to work with
-         Set ids = new HashSet(unloadedSessions_.keySet());
+         Set<String> ids = new HashSet<String>(unloadedSessions_.keySet());
 
          if(trace_) {
             log_.trace("findSessions: loading sessions from distributed cache: " + ids);
          }
 
-         for(Iterator it = ids.iterator(); it.hasNext();) {
-            loadSession((String) it.next());
+         for(String id :  ids) {
+            loadSession(id);
          }
       }
 
@@ -622,7 +622,8 @@
    public void start() throws LifecycleException
    {
       // Identify ourself more clearly
-      log_ = Logger.getLogger(getClass().getName() + "." + getContainer().getName());
+      log_ = Logger.getLogger(getClass().getName() + "." + 
+                              getContainer().getName().replaceAll("/", ""));
       
       if (embedded_)
       {
@@ -860,7 +861,7 @@
     */
    public String listSessionIds()
    {
-      Set ids = new HashSet(sessions_.keySet());
+      Set<String> ids = new HashSet<String>(sessions_.keySet());
       ids.addAll(unloadedSessions_.keySet());
       return reportSessionIds(ids);
    }
@@ -959,7 +960,8 @@
       }
       else
       {
-         log_.warn("");
+         log_.warn("Received local attribute notification for " + realId + 
+               " but session is not locally active");
       }
    }
    
@@ -1259,10 +1261,9 @@
          // and permanently losing part of its node structure in JBoss Cache.
          long maxUnrep = maxUnreplicatedInterval_ < 0 ? 60 : maxUnreplicatedInterval_;
          
-         Map unloaded = new HashMap(unloadedSessions_);
-         for (Iterator<Map.Entry<String, OwnedSessionUpdate>> it = unloaded.entrySet().iterator(); it.hasNext(); )
+         Map<String, OwnedSessionUpdate> unloaded = new HashMap<String, OwnedSessionUpdate>(unloadedSessions_);
+         for (Map.Entry<String, OwnedSessionUpdate> entry : unloaded.entrySet())
          {
-            Map.Entry<String, OwnedSessionUpdate> entry = it.next();
             String realId = entry.getKey();
             OwnedSessionUpdate osu = entry.getValue();
             
@@ -2235,11 +2236,11 @@
       return (getUseJK() ? Util.getRealId(id) : id);
    }
    
-   private String reportSessionIds(Set ids)
+   private String reportSessionIds(Set<String> ids)
    {
       StringBuffer sb = new StringBuffer();
       boolean added = false;
-      for (Iterator it = ids.iterator(); it.hasNext(); )
+      for (String id : ids)
       {
          if (added)
          {
@@ -2250,11 +2251,12 @@
             added = true;
          }
          
-         sb.append(it.next());
+         sb.append(id);
       }
       return sb.toString();
    }   
    
+   @SuppressWarnings("unchecked")
    private static ContextClassLoaderSwitcher getContextClassLoaderSwitcher()
    {
       return (ContextClassLoaderSwitcher) AccessController.doPrivileged(ContextClassLoaderSwitcher.INSTANTIATOR);