Author: fhanik
Date: Mon Jun 30 13:04:27 2008
New Revision: 672888
URL: http://svn.apache.org/viewvc?rev=672888&view=rev
Log:
commit fix for 45279
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/membership/McastServiceImpl.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=672888&r1=672887&r2=672888&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Mon Jun 30 13:04:27 2008
@@ -38,12 +38,6 @@
+1: markt, fhanik
-1:
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=45279
- Properly close multicast socket
- http://svn.apache.org/viewvc?rev=671650&view=rev
- +1: fhanik, markt, remm
- -1:
-
* Fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=45272
Patch attached in bugzilla issue
+1: fhanik, markt, remm (pfff, use ff)
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/membership/McastServiceImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/membership/McastServiceImpl.java?rev=672888&r1=672887&r2=672888&view=diff
==============================================================================
---
tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/membership/McastServiceImpl.java
(original)
+++
tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/membership/McastServiceImpl.java
Mon Jun 30 13:04:27 2008
@@ -299,6 +299,7 @@
send(false);
//leave mcast group
try {socket.leaveGroup(address);}catch ( Exception ignore){}
+ try {socket.close();}catch ( Exception ignore){}
serviceStartTime = Long.MAX_VALUE;
}
return (startLevel == 0);
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=672888&r1=672887&r2=672888&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Mon Jun 30 13:04:27 2008
@@ -378,6 +378,7 @@
</subsection>
<subsection name="Cluster">
<changelog>
+ <fix><bug>45279</bug>Properly close multicast socket.</fix>
<update>
Fix session replication dead lock during non sticky load balancing.
(fhanik)
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
