Author: fhanik
Date: Fri Aug 11 09:25:18 2006
New Revision: 430819
URL: http://svn.apache.org/viewvc?rev=430819&view=rev
Log:
Fixed the poller destroy method
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
Modified: tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java?rev=430819&r1=430818&r2=430819&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java Fri
Aug 11 09:25:18 2006
@@ -960,14 +960,7 @@
// exit, otherwise parallel descturction of sockets which are still
// in the poller can cause problems
close = true;
- try {
- synchronized (this) {
- this.wait(selectorTimeout * 2);
- }
- } catch (InterruptedException e) {
- // Ignore
- }
- close = true;
+ selector.wakeup();
}
public void addEvent(Runnable event) {
@@ -1115,7 +1108,7 @@
if ( sk.isValid() && attachment != null ) {
attachment.access();
sk.attach(attachment);
- sk.interestOps(0);
+ sk.interestOps(0); //this is a must, so that we
don't have multiple threads messing with the socket
attachment.interestOps(0);
NioChannel channel = attachment.getChannel();
if (sk.isReadable() || sk.isWritable() ) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
