You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hc.apache.org by ol...@apache.org on 2007/09/11 21:28:29 UTC
svn commit: r574673 - in
/jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/protocol:
ThrottlingHttpClientHandler.java ThrottlingHttpServiceHandler.java
Author: olegk
Date: Tue Sep 11 12:28:28 2007
New Revision: 574673
URL: http://svn.apache.org/viewvc?rev=574673&view=rev
Log:
Terminate the worker without throwing an InterruptedIOException if the connection has been shut down
Modified:
jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/protocol/ThrottlingHttpClientHandler.java
jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/protocol/ThrottlingHttpServiceHandler.java
Modified: jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/protocol/ThrottlingHttpClientHandler.java
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/protocol/ThrottlingHttpClientHandler.java?rev=574673&r1=574672&r2=574673&view=diff
==============================================================================
--- jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/protocol/ThrottlingHttpClientHandler.java (original)
+++ jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/protocol/ThrottlingHttpClientHandler.java Tue Sep 11 12:28:28 2007
@@ -32,7 +32,6 @@
package org.apache.http.nio.protocol;
import java.io.IOException;
-import java.io.InterruptedIOException;
import java.io.OutputStream;
import org.apache.http.ConnectionReuseStrategy;
@@ -403,7 +402,7 @@
break;
}
if (currentState == ServerConnState.SHUTDOWN) {
- throw new InterruptedIOException("Service interrupted");
+ return;
}
connState.wait();
}
@@ -460,7 +459,7 @@
break;
}
if (currentState == ServerConnState.SHUTDOWN) {
- throw new InterruptedIOException("Service interrupted");
+ return;
}
connState.wait();
}
@@ -482,7 +481,7 @@
break;
}
if (currentState == ServerConnState.SHUTDOWN) {
- throw new InterruptedIOException("Service interrupted");
+ return;
}
connState.wait();
}
Modified: jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/protocol/ThrottlingHttpServiceHandler.java
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/protocol/ThrottlingHttpServiceHandler.java?rev=574673&r1=574672&r2=574673&view=diff
==============================================================================
--- jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/protocol/ThrottlingHttpServiceHandler.java (original)
+++ jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/protocol/ThrottlingHttpServiceHandler.java Tue Sep 11 12:28:28 2007
@@ -32,7 +32,6 @@
package org.apache.http.nio.protocol;
import java.io.IOException;
-import java.io.InterruptedIOException;
import java.io.OutputStream;
import org.apache.http.ConnectionReuseStrategy;
@@ -365,7 +364,7 @@
break;
}
if (currentState == ServerConnState.SHUTDOWN) {
- throw new InterruptedIOException("Service interrupted");
+ return;
}
connState.wait();
}
@@ -428,7 +427,7 @@
break;
}
if (currentState == ServerConnState.SHUTDOWN) {
- throw new InterruptedIOException("Service interrupted");
+ return;
}
connState.wait();
}