Author: markt
Date: Sun Jun 6 23:43:17 2010
New Revision: 952022
URL: http://svn.apache.org/viewvc?rev=952022&view=rev
Log:
Fix missing message text and logging with unexpected logger issues in cluster
listeners
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/authenticator/ClusterSingleSignOnListener.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/ClusterSessionListener.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/JvmRouteSessionIDBinderListener.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=952022&r1=952021&r2=952022&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Sun Jun 6 23:43:17 2010
@@ -135,12 +135,6 @@ PATCHES PROPOSED TO BACKPORT:
+1: rjung, markt, kkolinko
-1:
-* Fix missing message text and logging with unexpected logger issues in cluster
- listeners
- http://people.apache.org/~markt/patches/2010-05-19-lost-messages.patch
- +1: markt, rjung, kkolinko
- -1:
-
* Fix ByteChunk.indexOf(String, ...) when the string is of length 1
http://svn.apache.org/viewvc?rev=945231&view=rev
+1: kkolinko, markt, rjung
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/authenticator/ClusterSingleSignOnListener.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/authenticator/ClusterSingleSignOnListener.java?rev=952022&r1=952021&r2=952022&view=diff
==============================================================================
---
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/authenticator/ClusterSingleSignOnListener.java
(original)
+++
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/authenticator/ClusterSingleSignOnListener.java
Sun Jun 6 23:43:17 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.
*/
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/ClusterSessionListener.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/ClusterSessionListener.java?rev=952022&r1=952021&r2=952022&view=diff
==============================================================================
---
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/ClusterSessionListener.java
(original)
+++
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/ClusterSessionListener.java
Sun Jun 6 23:43:17 2010
@@ -19,9 +19,11 @@ package org.apache.catalina.ha.session;
import java.util.Map;
+import org.apache.catalina.ha.ClusterListener;
import org.apache.catalina.ha.ClusterManager;
import org.apache.catalina.ha.ClusterMessage;
-import org.apache.catalina.ha.*;
+import org.apache.juli.logging.Log;
+import org.apache.juli.logging.LogFactory;
/**
* Receive replicated SessionMessage form other cluster node.
@@ -30,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.
*/
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/JvmRouteSessionIDBinderListener.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/JvmRouteSessionIDBinderListener.java?rev=952022&r1=952021&r2=952022&view=diff
==============================================================================
---
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/JvmRouteSessionIDBinderListener.java
(original)
+++
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/JvmRouteSessionIDBinderListener.java
Sun Jun 6 23:43:17 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
@@ -37,6 +40,12 @@ import org.apache.catalina.ha.*;
*/
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.
*/
Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=952022&r1=952021&r2=952022&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Sun Jun 6 23:43:17 2010
@@ -228,6 +228,10 @@
<fix>
<bug>49170</bug>: Do not send duplicated session. (kfujino)
</fix>
+ <fix>
+ Add missing messages and ensure cluster listeners log messages to
+ correct logger. (markt)
+ </fix>
</changelog>
</subsection>
<subsection name="Webapps">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
