You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by rj...@apache.org on 2010/06/19 11:22:54 UTC
svn commit: r956203 - in
/tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster:
authenticator/ClusterSingleSignOnListener.java
session/ClusterSessionListener.java
session/JvmRouteSessionIDBinderListener.java
Author: rjung
Date: Sat Jun 19 09:22:54 2010
New Revision: 956203
URL: http://svn.apache.org/viewvc?rev=956203&view=rev
Log:
Fix missing message text and logging with unexpected
logger issues in cluster listeners.
Backport of r946107 (trunk) and r952022 (TC 6).
Modified:
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/authenticator/ClusterSingleSignOnListener.java
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/ClusterSessionListener.java
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/JvmRouteSessionIDBinderListener.java
Modified: tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/authenticator/ClusterSingleSignOnListener.java
URL: http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/authenticator/ClusterSingleSignOnListener.java?rev=956203&r1=956202&r2=956203&view=diff
==============================================================================
--- tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/authenticator/ClusterSingleSignOnListener.java (original)
+++ tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/authenticator/ClusterSingleSignOnListener.java Sat Jun 19 09:22:54 2010
@@ -24,6 +24,8 @@ import org.apache.catalina.Session;
import org.apache.catalina.cluster.ClusterManager;
import org.apache.catalina.cluster.ClusterMessage;
import org.apache.catalina.cluster.session.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.cluster.sessi
*/
public class ClusterSingleSignOnListener extends ClusterListener {
+ private static final Log log =
+ LogFactory.getLog(ClusterSingleSignOnListener.class);
+
/**
* The descriptive information about this implementation.
*/
Modified: tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/ClusterSessionListener.java
URL: http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/ClusterSessionListener.java?rev=956203&r1=956202&r2=956203&view=diff
==============================================================================
--- tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/ClusterSessionListener.java (original)
+++ tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/ClusterSessionListener.java Sat Jun 19 09:22:54 2010
@@ -21,6 +21,8 @@ import java.util.Map;
import org.apache.catalina.cluster.ClusterManager;
import org.apache.catalina.cluster.ClusterMessage;
+import org.apache.juli.logging.Log;
+import org.apache.juli.logging.LogFactory;
/**
* Receive replicated SessionMessage form other cluster node.
@@ -29,7 +31,10 @@ import org.apache.catalina.cluster.Clust
* @version $Id$
*/
public class ClusterSessionListener extends ClusterListener {
-
+
+ private static final Log log =
+ LogFactory.getLog(ClusterSessionListener.class);
+
/**
* The descriptive information about this implementation.
*/
Modified: tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/JvmRouteSessionIDBinderListener.java
URL: http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/JvmRouteSessionIDBinderListener.java?rev=956203&r1=956202&r2=956203&view=diff
==============================================================================
--- tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/JvmRouteSessionIDBinderListener.java (original)
+++ tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/JvmRouteSessionIDBinderListener.java Sat Jun 19 09:22:54 2010
@@ -26,6 +26,9 @@ import org.apache.catalina.LifecycleExce
import org.apache.catalina.Session;
import org.apache.catalina.cluster.ClusterMessage;
import org.apache.catalina.core.StandardEngine;
+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,6 +39,12 @@ import org.apache.catalina.core.Standard
*/
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.
*/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org