[Jboss-cvs] JBossAS SVN: r55048 - trunk/tomcat/src/main/org/jboss/web/tomcat/tc6/session

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

Author: bstansberry at jboss.com
Date: 2006-08-02 17:15:58 -0400 (Wed, 02 Aug 2006)
New Revision: 55048

Modified:
   trunk/tomcat/src/main/org/jboss/web/tomcat/tc6/session/InstantSnapshotManager.java
   trunk/tomcat/src/main/org/jboss/web/tomcat/tc6/session/SnapshotManager.java
Log:
[JBAS-3318] Replicate all sessions affected by a cross-context call
Get rid of protected fields

Modified: trunk/tomcat/src/main/org/jboss/web/tomcat/tc6/session/InstantSnapshotManager.java
===================================================================
--- trunk/tomcat/src/main/org/jboss/web/tomcat/tc6/session/InstantSnapshotManager.java	2006-08-02 21:15:21 UTC (rev 55047)
+++ trunk/tomcat/src/main/org/jboss/web/tomcat/tc6/session/InstantSnapshotManager.java	2006-08-02 21:15:58 UTC (rev 55048)
@@ -22,19 +22,17 @@
 package org.jboss.web.tomcat.tc6.session;
 
 import org.apache.catalina.Session;
-import org.jboss.logging.Logger;
 
 /**
  * A concrete implementation of the snapshot manager interface
  * that does instant replication of a modified session
  *
  * @author Thomas Peuss <jboss at peuss.de>
+ * @author Brian Stansberry
  * @version $Revision$
  */
 public class InstantSnapshotManager extends SnapshotManager
 {
-   static Logger log = Logger.getLogger(InstantSnapshotManager.class);
-
    public InstantSnapshotManager(AbstractJBossManager manager, String path)
    {
       super(manager, path);
@@ -48,12 +46,14 @@
       try
       {
          // find the session that has been modified
-         Session session = manager.findSession(id);
-         manager.storeSession(session);
+         AbstractJBossManager mgr = getManager();
+         Session session = mgr.findSession(id);
+         if (session != null)
+            mgr.storeSession(session);
       }
       catch (Exception e)
       {
-         log.warn("Failed to replicate sessionID:" + id, e);
+         getLog().warn("Failed to replicate sessionID:" + id, e);
       }
    }
 

Modified: trunk/tomcat/src/main/org/jboss/web/tomcat/tc6/session/SnapshotManager.java
===================================================================
--- trunk/tomcat/src/main/org/jboss/web/tomcat/tc6/session/SnapshotManager.java	2006-08-02 21:15:21 UTC (rev 55047)
+++ trunk/tomcat/src/main/org/jboss/web/tomcat/tc6/session/SnapshotManager.java	2006-08-02 21:15:58 UTC (rev 55048)
@@ -22,6 +22,7 @@
 package org.jboss.web.tomcat.tc6.session;
 
 import org.apache.catalina.Context;
+import org.jboss.logging.Logger;
 
 /**
  * Abstract base class for a session snapshot manager.
@@ -32,15 +33,22 @@
 public abstract class SnapshotManager
 {
    // The manager the snapshot manager should use
-   protected AbstractJBossManager manager;
+   private AbstractJBossManager manager;
 
    // The context-path
-   protected String contextPath;
+   private String contextPath;
+   
+   private Logger log;
 
    public SnapshotManager(AbstractJBossManager manager, String path)
    {
       this.manager = manager;
       contextPath = path;
+      
+      String suffix = path;
+      if (suffix == null || "".equals(suffix))
+         suffix = "ROOT";
+      log = Logger.getLogger(getClass().getName() + "." + suffix);
    }
 
    /**
@@ -58,4 +66,21 @@
     * Stop the snapshot manager
     */
    public abstract void stop();
+
+   protected String getContextPath()
+   {
+      return contextPath;
+   }
+
+   protected Logger getLog()
+   {
+      return log;
+   }
+
+   protected AbstractJBossManager getManager()
+   {
+      return manager;
+   }
+   
+   
 }