aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Becker2012-03-06 15:26:46 (EST)
committerSimone Bordet2012-03-06 15:26:46 (EST)
commitff75d9e38adf18cefaea429f7305cb5f7bf7f9b4 (patch)
tree7ded59737a11328d6627bc18f7d004ee46108db9
parentffdcfa5ddeabfa3d8b429a14d1fe86ba727ef92f (diff)
downloadorg.eclipse.jetty.project-ff75d9e38adf18cefaea429f7305cb5f7bf7f9b4.zip
org.eclipse.jetty.project-ff75d9e38adf18cefaea429f7305cb5f7bf7f9b4.tar.gz
org.eclipse.jetty.project-ff75d9e38adf18cefaea429f7305cb5f7bf7f9b4.tar.bz2
373394: fix for IllegalArgumentException in SelectChannelEndpoint.blockWritable() when wait is called with a negative value.
-rw-r--r--jetty-io/src/main/java/org/eclipse/jetty/io/nio/SelectChannelEndPoint.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/jetty-io/src/main/java/org/eclipse/jetty/io/nio/SelectChannelEndPoint.java b/jetty-io/src/main/java/org/eclipse/jetty/io/nio/SelectChannelEndPoint.java
index b7b2108..b24ebd8 100644
--- a/jetty-io/src/main/java/org/eclipse/jetty/io/nio/SelectChannelEndPoint.java
+++ b/jetty-io/src/main/java/org/eclipse/jetty/io/nio/SelectChannelEndPoint.java
@@ -385,7 +385,7 @@ public class SelectChannelEndPoint extends ChannelEndPoint implements AsyncEndPo
try
{
updateKey();
- this.wait(timeoutMs>=0?(end-now):10000);
+ this.wait(timeoutMs>0?(end-now):10000);
}
catch (InterruptedException e)
{
@@ -433,7 +433,7 @@ public class SelectChannelEndPoint extends ChannelEndPoint implements AsyncEndPo
try
{
updateKey();
- this.wait(timeoutMs>=0?(end-now):10000);
+ this.wait(timeoutMs>0?(end-now):10000);
}
catch (InterruptedException e)
{
@@ -462,7 +462,7 @@ public class SelectChannelEndPoint extends ChannelEndPoint implements AsyncEndPo
*/
public void scheduleWrite()
{
- if (_writable==true)
+ if (_writable)
LOG.debug("Required scheduleWrite {}",this);
_writable=false;