tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rj...@apache.org
Subject svn commit: r790337 - in /tomcat: container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/mcast/McastServiceImpl.java container/tc5.5.x/webapps/docs/changelog.xml current/tc5.5.x/STATUS.txt
Date Wed, 01 Jul 2009 19:28:51 GMT
Author: rjung
Date: Wed Jul  1 19:28:51 2009
New Revision: 790337

URL: http://svn.apache.org/viewvc?rev=790337&view=rev
Log:
Fix BZ 45279: Properly close multicast socket.

Backport of r672888 from TC6 and r789837 from OACC.

Modified:
    tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/mcast/McastServiceImpl.java
    tomcat/container/tc5.5.x/webapps/docs/changelog.xml
    tomcat/current/tc5.5.x/STATUS.txt

Modified: tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/mcast/McastServiceImpl.java
URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/mcast/McastServiceImpl.java?rev=790337&r1=790336&r2=790337&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/mcast/McastServiceImpl.java
(original)
+++ tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/mcast/McastServiceImpl.java
Wed Jul  1 19:28:51 2009
@@ -241,6 +241,7 @@
             if(receiver!= null) receiver.interrupt() ;
             receiver = null;
             serviceStartTime = Long.MAX_VALUE;
+            socket.close();
         }
     }
 

Modified: tomcat/container/tc5.5.x/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/docs/changelog.xml?rev=790337&r1=790336&r2=790337&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/webapps/docs/changelog.xml (original)
+++ tomcat/container/tc5.5.x/webapps/docs/changelog.xml Wed Jul  1 19:28:51 2009
@@ -217,6 +217,9 @@
   <subsection name="Cluster">
     <changelog>
       <fix>
+        <bug>45279</bug>: Properly close multicast socket. (fhanik, rjung)
+      </fix>
+      <fix>
         <bug>45447</bug>: Add Spanish resource files.
         Patch provided by Jesus Marin. (markt, rjung)
       </fix>

Modified: tomcat/current/tc5.5.x/STATUS.txt
URL: http://svn.apache.org/viewvc/tomcat/current/tc5.5.x/STATUS.txt?rev=790337&r1=790336&r2=790337&view=diff
==============================================================================
--- tomcat/current/tc5.5.x/STATUS.txt (original)
+++ tomcat/current/tc5.5.x/STATUS.txt Wed Jul  1 19:28:51 2009
@@ -60,13 +60,6 @@
   -1: markt - For the common and combined pattern in ALV there is no space between %t and
%r
               For the common and combined pattern in ALV the %r has no opening quote, only
the closing quote
 
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=45279
-  Close socket when closing multicast.
-  Backport of http://svn.apache.org/viewvc?view=rev&revision=672888 from tc6
-  resp. http://svn.apache.org/viewvc?view=rev&revision=789837 from OACC.
-  +1: rjung, kkolinko, markt
-  -1:
-
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=45317
   Properly output the state transfer timeout for sessions.
   Backport of http://svn.apache.org/viewvc?view=rev&revision=674750 from tc6



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


Mime
View raw message