You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2010/05/19 12:24:53 UTC
svn commit: r946107 - in /tomcat/trunk/java/org/apache/catalina/ha:
ClusterListener.java authenticator/ClusterSingleSignOnListener.java
session/ClusterSessionListener.java
session/JvmRouteSessionIDBinderListener.java
Author: markt
Date: Wed May 19 10:24:53 2010
New Revision: 946107
URL: http://svn.apache.org/viewvc?rev=946107&view=rev
Log:
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
Modified:
tomcat/trunk/java/org/apache/catalina/ha/ClusterListener.java
tomcat/trunk/java/org/apache/catalina/ha/authenticator/ClusterSingleSignOnListener.java
tomcat/trunk/java/org/apache/catalina/ha/session/ClusterSessionListener.java
tomcat/trunk/java/org/apache/catalina/ha/session/JvmRouteSessionIDBinderListener.java
Modified: tomcat/trunk/java/org/apache/catalina/ha/ClusterListener.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/ClusterListener.java?rev=946107&r1=946106&r2=946107&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ha/ClusterListener.java (original)
+++ tomcat/trunk/java/org/apache/catalina/ha/ClusterListener.java Wed May 19 10:24:53 2010
@@ -37,17 +37,14 @@ import org.apache.tomcat.util.res.String
*/
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;
Modified: tomcat/trunk/java/org/apache/catalina/ha/authenticator/ClusterSingleSignOnListener.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/authenticator/ClusterSingleSignOnListener.java?rev=946107&r1=946106&r2=946107&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ha/authenticator/ClusterSingleSignOnListener.java (original)
+++ tomcat/trunk/java/org/apache/catalina/ha/authenticator/ClusterSingleSignOnListener.java Wed May 19 10:24:53 2010
@@ -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.ClusterLis
*/
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
//--Constructor---------------------------------------------
public ClusterSingleSignOnListener() {
+ // NO-OP
}
//--Logic---------------------------------------------------
@@ -152,13 +158,12 @@ public class ClusterSingleSignOnListener
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);
Modified: tomcat/trunk/java/org/apache/catalina/ha/session/ClusterSessionListener.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/session/ClusterSessionListener.java?rev=946107&r1=946106&r2=946107&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ha/session/ClusterSessionListener.java (original)
+++ tomcat/trunk/java/org/apache/catalina/ha/session/ClusterSessionListener.java Wed May 19 10:24:53 2010
@@ -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 exte
//--Constructor---------------------------------------------
public ClusterSessionListener() {
+ // NO-OP
}
//--Logic---------------------------------------------------
Modified: tomcat/trunk/java/org/apache/catalina/ha/session/JvmRouteSessionIDBinderListener.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/session/JvmRouteSessionIDBinderListener.java?rev=946107&r1=946106&r2=946107&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ha/session/JvmRouteSessionIDBinderListener.java (original)
+++ tomcat/trunk/java/org/apache/catalina/ha/session/JvmRouteSessionIDBinderListener.java Wed May 19 10:24:53 2010
@@ -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 JvmRouteSessionIDBinderList
//--Constructor---------------------------------------------
public JvmRouteSessionIDBinderListener() {
+ // NO-OP
}
//--Logic---------------------------------------------------
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org