tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r1142214 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/org/apache/catalina/tribes/ByteMessage.java webapps/docs/changelog.xml
Date Sat, 02 Jul 2011 12:18:15 GMT
Author: markt
Date: Sat Jul  2 12:18:15 2011
New Revision: 1142214

URL: http://svn.apache.org/viewvc?rev=1142214&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50646
Tribes ByteMessage will get corrupted if message size exceeds the underlying buffer size
Patch provided by Olivier Costet

Modified:
    tomcat/tc6.0.x/trunk/STATUS.txt
    tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/ByteMessage.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=1142214&r1=1142213&r2=1142214&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Sat Jul  2 12:18:15 2011
@@ -206,14 +206,6 @@ PATCHES PROPOSED TO BACKPORT:
   +1: markt, kkolinko
   -1:
 
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50646
-  Tribes ByteMessage will get corrupted if message size exceeds the underlying
-  buffer size
-  Patch provided by Olivier Costet
-  https://issues.apache.org/bugzilla/attachment.cgi?id=26544
-  +1: markt, kkolinko, kfujino
-  -1:
-
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51206
   Make CATALINA_BASE visible to setenv.[sh|bat]
   http://svn.apache.org/viewvc?rev=1137862&view=rev

Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/ByteMessage.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/ByteMessage.java?rev=1142214&r1=1142213&r2=1142214&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/ByteMessage.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/ByteMessage.java Sat Jul  2 12:18:15
2011
@@ -86,7 +86,7 @@ public class ByteMessage implements Seri
     public void readExternal(ObjectInput in ) throws IOException {
         int length = in.readInt();
         message = new byte[length];
-        in.read(message,0,length);
+        in.readFully(message);
     }
 
     /**

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=1142214&r1=1142213&r2=1142214&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Sat Jul  2 12:18:15 2011
@@ -213,11 +213,14 @@
   <subsection name="Cluster">
     <changelog>
       <fix>
+        <bug>50646</bug>: Fix cluster message data corruption if message size
+        exceeds the underlying buffer size. Patch provided by Olivier Costet.
+        (markt)
+      </fix>
+      <fix>
         <bug>50950</bug>: Correct possible NotSerializableException for an
         authenticated session when running with a security manager. (markt)
       </fix>
-    </changelog>
-    <changelog>
       <fix>
         <bug>51306</bug>: Avoid NPE when handleSESSION_EXPIRED is processed 
         while handleSESSION_CREATED is being processed. (kfujino)



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message