Author: fhanik
Date: Wed Aug 9 14:22:24 2006
New Revision: 430148
URL: http://svn.apache.org/viewvc?rev=430148&view=rev
Log:
Fixed close down, and degraded a message to debug
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=430148&r1=430147&r2=430148&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 Wed
Aug 9 14:22:24 2006
@@ -153,7 +153,6 @@
protected ConcurrentLinkedQueue<NioChannel> nioChannels = new
ConcurrentLinkedQueue<NioChannel>() {
public boolean offer(NioChannel o) {
- if ( getSecure() ) return false;
//avoid over growing our cache or add after we have stopped
if ( running && (size() < curThreads) ) return super.offer(o);
else return false;
@@ -961,9 +960,10 @@
// Wait for polltime before doing anything, so that the poller
threads
// exit, otherwise parallel descturction of sockets which are still
// in the poller can cause problems
+ close = true;
try {
synchronized (this) {
- this.wait(pollTime / 1000);
+ this.wait(selectorTimeout * 2);
}
} catch (InterruptedException e) {
// Ignore
@@ -1350,7 +1350,7 @@
handshake = socket.handshake(key.isReadable(),
key.isWritable());
}catch ( IOException x ) {
handshake = -1;
- log.error("Error during SSL handshake",x);
+ if ( log.isDebugEnabled() ) log.debug("Error
during SSL handshake",x);
}catch ( CancelledKeyException ckx ) {
handshake = -1;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
