Author: yoavs
Date: Mon Nov 28 13:05:40 2005
New Revision: 349504
URL: http://svn.apache.org/viewcvs?rev=349504&view=rev
Log:
Bugzilla 37529: http://issues.apache.org/bugzilla/show_bug.cgi?id=37529
Modified:
tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/tcp/ReplicationListener.java
tomcat/container/tc5.5.x/webapps/docs/changelog.xml
Modified:
tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/tcp/ReplicationListener.java
URL:
http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/tcp/ReplicationListener.java?rev=349504&r1=349503&r2=349504&view=diff
==============================================================================
---
tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/tcp/ReplicationListener.java
(original)
+++
tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/tcp/ReplicationListener.java
Mon Nov 28 13:05:40 2005
@@ -1,5 +1,5 @@
/*
- * Copyright 1999,2004 The Apache Software Foundation.
+ * Copyright 1999,2004-2005 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -184,12 +184,18 @@
}
/**
- * Close Selector
+ * Close Selector.
+ *
* @see org.apache.catalina.cluster.tcp.ClusterReceiverBase#stopListening()
*/
- protected void stopListening(){
+ protected void stopListening() {
+ // Bugzilla 37529:
http://issues.apache.org/bugzilla/show_bug.cgi?id=37529
+ doListen = false;
if ( selector != null ) {
try {
+ for(int i = 0; i < getTcpThreadCount(); i++) {
+ selector.wakeup();
+ }
selector.close();
} catch ( Exception x ) {
log.error("Unable to close cluster receiver selector.",x);
@@ -197,7 +203,6 @@
selector = null;
}
}
- doListen = false;
}
// ----------------------------------------------------------
Modified: tomcat/container/tc5.5.x/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/webapps/docs/changelog.xml?rev=349504&r1=349503&r2=349504&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/webapps/docs/changelog.xml (original)
+++ tomcat/container/tc5.5.x/webapps/docs/changelog.xml Mon Nov 28 13:05:40 2005
@@ -211,8 +211,12 @@
<fix>
<bug>36866</bug>: Correct attribute name in conf/server.xml
documentation for Cluster element. (yoavs)
</fix>
- <fix><bug>37261</bug>: Allow xerces to know where the web.xml file is so
that relative entities can be resolved.
-
+ <fix>
+ <bug>37261</bug>: Allow xerces to know where the web.xml file is so
that relative entities can be resolved.
+ </fix>
+ <fix>
+ <bug>37529</bug>: Fixed race condition in
ReplicationLister#stopListening. Thanks to
+ Chris Walker for the patch. (yoavs)
</fix>
</changelog>
</subsection>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
