Make Log and StringManager instances private to the class.

This fixes:
- messages for one class being logged via the logger of another
- messages not being found since the class is in a different packager to the super class

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@946107 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/java/org/apache/catalina/ha/ClusterListener.java b/java/org/apache/catalina/ha/ClusterListener.java
index 9708c5f..1090b28 100644 (file)
--- a/java/org/apache/catalina/ha/ClusterListener.java
+++ b/java/org/apache/catalina/ha/ClusterListener.java
@@ -37,17 +37,14 @@ import org.apache.tomcat.util.res.StringManager;
  */
 public abstract class ClusterListener implements ChannelListener {
 
-    public static final org.apache.juli.logging.Log log =
+    private static final org.apache.juli.logging.Log log =
         org.apache.juli.logging.LogFactory.getLog(ClusterListener.class);
 
-
     //--Instance Variables--------------------------------------
 
     /**
      * The string manager for this package.
      */
-    protected static final StringManager sm =
-        StringManager.getManager(Constants.Package);
 
     protected CatalinaCluster cluster = null;
 

diff --git a/java/org/apache/catalina/ha/authenticator/ClusterSingleSignOnListener.java b/java/org/apache/catalina/ha/authenticator/ClusterSingleSignOnListener.java
index 77cee04..c6805e3 100644 (file)
--- a/java/org/apache/catalina/ha/authenticator/ClusterSingleSignOnListener.java
+++ b/java/org/apache/catalina/ha/authenticator/ClusterSingleSignOnListener.java
@@ -24,6 +24,8 @@ import org.apache.catalina.Session;
 import org.apache.catalina.ha.ClusterManager;
 import org.apache.catalina.ha.ClusterMessage;
 import org.apache.catalina.ha.ClusterListener;
+import org.apache.juli.logging.Log;
+import org.apache.juli.logging.LogFactory;
 
 /**
  * Receive replicated SingleSignOnMessage form other cluster node.
@@ -32,6 +34,9 @@ import org.apache.catalina.ha.ClusterListener;
  */
 public class ClusterSingleSignOnListener extends ClusterListener {
  
+    private static final Log log =
+        LogFactory.getLog(ClusterSingleSignOnListener.class);
+
     /**
      * The descriptive information about this implementation.
      */
@@ -45,6 +50,7 @@ public class ClusterSingleSignOnListener extends ClusterListener {
     //--Constructor---------------------------------------------
 
     public ClusterSingleSignOnListener() {
+        // NO-OP
     }
 
     //--Logic---------------------------------------------------
@@ -152,13 +158,12 @@ public class ClusterSingleSignOnListener extends ClusterListener {
                         log.error("Session doesn't exist:" + io);
                     }
                     return session;
-                } else {
-                    //this happens a lot before the system has started
-                    // up
-                    if (log.isDebugEnabled())
-                        log.debug("Context manager doesn't exist:"
-                                  + entry.getKey());
                 }
+                //this happens a lot before the system has started
+                // up
+                if (log.isDebugEnabled())
+                    log.debug("Context manager doesn't exist:"
+                              + entry.getKey());
             }
         } else {
             ClusterManager mgr = managers.get(ctxname);

diff --git a/java/org/apache/catalina/ha/session/ClusterSessionListener.java b/java/org/apache/catalina/ha/session/ClusterSessionListener.java
index f414884..18c3fbd 100644 (file)
--- a/java/org/apache/catalina/ha/session/ClusterSessionListener.java
+++ b/java/org/apache/catalina/ha/session/ClusterSessionListener.java
@@ -19,7 +19,11 @@ package org.apache.catalina.ha.session;
 
 import java.util.Map;
 
-import org.apache.catalina.ha.*;
+import org.apache.catalina.ha.ClusterListener;
+import org.apache.catalina.ha.ClusterManager;
+import org.apache.catalina.ha.ClusterMessage;
+import org.apache.juli.logging.Log;
+import org.apache.juli.logging.LogFactory;
 
 /**
  * Receive replicated SessionMessage form other cluster node.
@@ -28,7 +32,10 @@ import org.apache.catalina.ha.*;
  * @version $Id$
  */
 public class ClusterSessionListener extends ClusterListener {
- 
+
+    private static final Log log =
+        LogFactory.getLog(ClusterSessionListener.class);
+    
     /**
      * The descriptive information about this implementation.
      */
@@ -37,6 +44,7 @@ public class ClusterSessionListener extends ClusterListener {
     //--Constructor---------------------------------------------
 
     public ClusterSessionListener() {
+        // NO-OP
     }
 
     //--Logic---------------------------------------------------

diff --git a/java/org/apache/catalina/ha/session/JvmRouteSessionIDBinderListener.java b/java/org/apache/catalina/ha/session/JvmRouteSessionIDBinderListener.java
index a784489..9087037 100644 (file)
--- a/java/org/apache/catalina/ha/session/JvmRouteSessionIDBinderListener.java
+++ b/java/org/apache/catalina/ha/session/JvmRouteSessionIDBinderListener.java
@@ -24,9 +24,12 @@ import org.apache.catalina.Context;
 import org.apache.catalina.Engine;
 import org.apache.catalina.LifecycleException;
 import org.apache.catalina.Session;
+import org.apache.catalina.ha.ClusterListener;
 import org.apache.catalina.ha.ClusterMessage;
 import org.apache.catalina.core.StandardEngine;
-import org.apache.catalina.ha.*;
+import org.apache.juli.logging.Log;
+import org.apache.juli.logging.LogFactory;
+import org.apache.tomcat.util.res.StringManager;
 
 /**
  * Receive SessionID cluster change from other backup node after primary session
@@ -36,11 +39,18 @@ import org.apache.catalina.ha.*;
  * @version $Id$
  */
 public class JvmRouteSessionIDBinderListener extends ClusterListener {
- 
+
+    private static final Log log =
+        LogFactory.getLog(JvmRouteSessionIDBinderListener.class);
+    
+    private static final StringManager sm =
+        StringManager.getManager(Constants.Package);
+
     /**
      * The descriptive information about this implementation.
      */
-    protected static final String info = "org.apache.catalina.ha.session.JvmRouteSessionIDBinderListener/1.1";
+    protected static final String info =
+        "org.apache.catalina.ha.session.JvmRouteSessionIDBinderListener/1.1";
 
     //--Instance Variables--------------------------------------
 
@@ -55,6 +65,7 @@ public class JvmRouteSessionIDBinderListener extends ClusterListener {
     //--Constructor---------------------------------------------
 
     public JvmRouteSessionIDBinderListener() {
+        // NO-OP
     }
 
     //--Logic---------------------------------------------------