tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r932909 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/org/apache/catalina/tribes/transport/ReplicationTransmitter.java java/org/apache/catalina/tribes/transport/nio/PooledParallelSender.java webapps/docs/changelog.xml
Date Sun, 11 Apr 2010 14:15:40 GMT
Author: markt
Date: Sun Apr 11 14:15:40 2010
New Revision: 932909

URL: http://svn.apache.org/viewvc?rev=932909&view=rev
Log:
Fix cluster regression, previous incorrect patch (fhanik)

Modified:
    tomcat/tc6.0.x/trunk/STATUS.txt
    tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/transport/ReplicationTransmitter.java
    tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/transport/nio/PooledParallelSender.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=932909&r1=932908&r2=932909&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Sun Apr 11 14:15:40 2010
@@ -157,12 +157,6 @@ PATCHES PROPOSED TO BACKPORT:
     one is already documented as "sessionTimeout" in config/http.xml, though,
     still, renaming might break someone's configurations.
 
-* Fix cluster regression, previous incorrect patch
-  http://svn.apache.org/viewvc?rev=924776&view=rev
-  https://issues.apache.org/bugzilla/show_bug.cgi?id=48934
-  +1: fhanik, markt, kkolinko
-  -1: 
-
 * Fix cross-context session expiration
   http://svn.apache.org/viewvc?rev=926716&view=rev
   +1: markt

Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/transport/ReplicationTransmitter.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/transport/ReplicationTransmitter.java?rev=932909&r1=932908&r2=932909&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/transport/ReplicationTransmitter.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/transport/ReplicationTransmitter.java
Sun Apr 11 14:15:40 2010
@@ -77,12 +77,7 @@ public class ReplicationTransmitter impl
      */
     public void sendMessage(ChannelMessage message, Member[] destination) throws ChannelException
{
         MultiPointSender sender = getTransport();
-        try {
-            sender.sendMessage(destination,message);
-        }catch (ChannelException x) {
-            sender.disconnect();
-            throw x;
-        }
+        sender.sendMessage(destination,message);
     }
     
     

Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/transport/nio/PooledParallelSender.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/transport/nio/PooledParallelSender.java?rev=932909&r1=932908&r2=932909&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/transport/nio/PooledParallelSender.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/transport/nio/PooledParallelSender.java
Sun Apr 11 14:15:40 2010
@@ -52,9 +52,12 @@ public class PooledParallelSender extend
             try {
                 sender.sendMessage(destination, message);
                 sender.keepalive();
+            } catch (ChannelException x) {
+                sender.disconnect();
+                throw x;
             } finally {
-                if (!connected) disconnect();
                 returnSender(sender);
+                if (!connected) disconnect();
             }
         }
     }

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=932909&r1=932908&r2=932909&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Sun Apr 11 14:15:40 2010
@@ -78,20 +78,24 @@
       </add>
     </changelog>
   </subsection>
-  <subsection name="Cluster">
+  <subsection name="Jasper">
     <changelog>
       <fix>
-        <bug>49051</bug>: memberAlive is not called if member has not already

-        existed in membership. (kfujino)
+        <bug>48701</bug>: Add a system property to allow disabling enforcement
+        of JSP.5.3. The specification recommends, but does not require, this
+        enforcement. (kkolinko)
       </fix>
     </changelog>
   </subsection>
-  <subsection name="Jasper">
+  <subsection name="Cluster">
     <changelog>
       <fix>
-        <bug>48701</bug>: Add a system property to allow disabling enforcement
-        of JSP.5.3. The specification recommends, but does not require, this
-        enforcement. (kkolinko)
+        <bug>49051</bug>: memberAlive is not called if member has not already

+        existed in membership. (kfujino)
+      </fix>
+      <fix>
+        <bug>48934</bug>: Previous fix to handle dropped connections incorrectly
+        permanently disabled session replication. (fhanik)
       </fix>
     </changelog>
   </subsection>



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


Mime
View raw message