Author: markt
Date: Mon Aug 27 21:34:27 2012
New Revision: 1377881
URL: http://svn.apache.org/viewvc?rev=1377881&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=53606
Fix possible NPE when sending pings between cluster nodes.
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/TcpPingInterceptor.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=1377881&r1=1377880&r2=1377881&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Mon Aug 27 21:34:27 2012
@@ -130,12 +130,6 @@ PATCHES PROPOSED TO BACKPORT:
+1: kfujino, kkolinko, markt
-1:
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=53606
- Fix possible NPE when sending pings between cluster nodes.
- http://svn.apache.org/viewvc?view=revision&revision=1366961
- +1: kfujino, kkolinko, markt
- -1:
-
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=53481
Add support for SSLHonorCipherOrder
http://svn.apache.org/viewvc?view=revision&revision=1371298
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/TcpPingInterceptor.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/TcpPingInterceptor.java?rev=1377881&r1=1377880&r2=1377881&view=diff
==============================================================================
---
tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/TcpPingInterceptor.java
(original)
+++
tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/TcpPingInterceptor.java
Mon Aug 27 21:34:27 2012
@@ -118,13 +118,17 @@ public class TcpPingInterceptor extends
}
protected void sendPing() {
- if (failureDetector.get()!=null) {
- //we have a reference to the failure detector
- //piggy back on that dude
- failureDetector.get().checkMembers(true);
- }else {
- if (staticOnly && staticMembers.get()!=null) {
- sendPingMessage(staticMembers.get().getMembers());
+ TcpFailureDetector tcpFailureDetector =
+ failureDetector != null ? failureDetector.get() : null;
+ if (tcpFailureDetector != null) {
+ // We have a reference to the failure detector
+ // Piggy back on it
+ tcpFailureDetector.checkMembers(true);
+ } else {
+ StaticMembershipInterceptor smi =
+ staticOnly && staticMembers != null ? staticMembers.get()
: null;
+ if (smi != null) {
+ sendPingMessage(smi.getMembers());
} else {
sendPingMessage(getMembers());
}
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=1377881&r1=1377880&r2=1377881&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Mon Aug 27 21:34:27 2012
@@ -265,6 +265,10 @@
<fix>
Replicate principal in ClusterSingleSignOn. (kfujino)
</fix>
+ <fix>
+ <bug>53606</bug>: Fix potential NPE in <code>TcpPingInterceptor</code>.
+ Based on a patch by F. Arnoud. (markt)
+ </fix>
</changelog>
</subsection>
<subsection name="Web applications">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
