You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by kf...@apache.org on 2012/07/31 10:24:44 UTC
svn commit: r1367456 - in /tomcat/tc7.0.x/trunk:
java/org/apache/catalina/tribes/group/interceptors/TcpPingInterceptor.java
webapps/docs/changelog.xml
Author: kfujino
Date: Tue Jul 31 08:24:43 2012
New Revision: 1367456
URL: http://svn.apache.org/viewvc?rev=1367456&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=53607.
To avoid NPE, set TCP PING data to ChannelMessage.
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/TcpPingInterceptor.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/TcpPingInterceptor.java
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/TcpPingInterceptor.java?rev=1367456&r1=1367455&r2=1367456&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/TcpPingInterceptor.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/TcpPingInterceptor.java Tue Jul 31 08:24:43 2012
@@ -27,6 +27,7 @@ import org.apache.catalina.tribes.Channe
import org.apache.catalina.tribes.Member;
import org.apache.catalina.tribes.group.ChannelInterceptorBase;
import org.apache.catalina.tribes.io.ChannelData;
+import org.apache.catalina.tribes.io.XByteBuffer;
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
@@ -145,6 +146,7 @@ public class TcpPingInterceptor extends
data.setAddress(getLocalMember(false));
data.setTimestamp(System.currentTimeMillis());
data.setOptions(getOptionFlag());
+ data.setMessage(new XByteBuffer(TCP_PING_DATA, false));
try {
super.sendMessage(members, data, null);
}catch (ChannelException x) {
Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1367456&r1=1367455&r2=1367456&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Tue Jul 31 08:24:43 2012
@@ -142,6 +142,10 @@
<bug>53606</bug>: Fix potential NPE in <code>TcpPingInterceptor</code>.
Based on a patch by F. Arnoud. (markt)
</fix>
+ <fix>
+ <bug>53607</bug>: To avoid NPE, set TCP PING data to ChannelMessage.
+ Patch provided by F.Arnoud (kfujino)
+ </fix>
</changelog>
</subsection>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org