Author: rjung
Date: Tue Jun 30 17:27:01 2009
New Revision: 789837
URL: http://svn.apache.org/viewvc?rev=789837&view=rev
Log:
BZ 45279: Fix socket when closing multicast.
Backport of r672888 from Tomcat 6.0.
Modified:
tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/mcast/McastServiceImpl.java
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/membership/McastServiceImpl.java
Modified: tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml?rev=789837&r1=789836&r2=789837&view=diff
==============================================================================
--- tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml (original)
+++ tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml Tue Jun 30 17:27:01 2009
@@ -32,6 +32,10 @@
<section name="Tomcat OACC 0.1 (rjung)">
<subsection name="Cluster">
<changelog>
+ <fix>
+ <bug>45279</bug>: Fix socket when closing multicast.
+ Backport from Tomcat 6.0. (rjung)
+ </fix>
<update>
<bug>45447</bug>: Add spanish message translations.
Backport from Tomcat 6.0. (rjung)
Modified:
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/mcast/McastServiceImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/mcast/McastServiceImpl.java?rev=789837&r1=789836&r2=789837&view=diff
==============================================================================
---
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/mcast/McastServiceImpl.java
(original)
+++
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/mcast/McastServiceImpl.java
Tue Jun 30 17:27:01 2009
@@ -243,6 +243,7 @@
if(receiver!= null) receiver.interrupt() ;
receiver = null;
serviceStartTime = Long.MAX_VALUE;
+ socket.close();
}
}
Modified:
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/membership/McastServiceImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/membership/McastServiceImpl.java?rev=789837&r1=789836&r2=789837&view=diff
==============================================================================
---
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/membership/McastServiceImpl.java
(original)
+++
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/membership/McastServiceImpl.java
Tue Jun 30 17:27:01 2009
@@ -280,6 +280,7 @@
}
//leave mcast group
try {socket.leaveGroup(address);}catch ( Exception ignore){}
+ try {socket.close();}catch ( Exception ignore){}
serviceStartTime = Long.MAX_VALUE;
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
