Author: fhanik
Date: Mon Mar 20 09:32:04 2006
New Revision: 387258
URL: http://svn.apache.org/viewcvs?rev=387258&view=rev
Log:
Fixed threads according to close call
Modified:
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/bio/BioReceiver.java
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/nio/NioReceiver.java
Modified:
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/bio/BioReceiver.java
URL:
http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/bio/BioReceiver.java?rev=387258&r1=387257&r2=387258&view=diff
==============================================================================
---
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/bio/BioReceiver.java
(original)
+++
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/bio/BioReceiver.java
Mon Mar 20 09:32:04 2006
@@ -132,7 +132,11 @@
}catch ( Exception x ) {
if ( doListen() ) throw x;
}
- if ( !doListen() ) break; //regular shutdown
+ if ( !doListen() ) {
+ thread.setDoRun(false);
+ thread.serviceSocket(null,null);
+ break; //regular shutdown
+ }
if ( socket == null ) continue;
socket.setReceiveBufferSize(getRxBufSize());
socket.setSendBufferSize(getRxBufSize());
Modified:
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/nio/NioReceiver.java
URL:
http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/nio/NioReceiver.java?rev=387258&r1=387257&r2=387258&view=diff
==============================================================================
---
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/nio/NioReceiver.java
(original)
+++
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/nio/NioReceiver.java
Mon Mar 20 09:32:04 2006
@@ -215,7 +215,7 @@
setListen(false);
if (selector != null) {
try {
- for (int i = 0; i < getTcpThreadCount(); i++) {
+ for (int i = 0; i < getMaxThreads(); i++) {
selector.wakeup();
}
selector.close();
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
