Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

446923 SharedBlockingCallback does not handle connector max idle time of Long.MAX_VALUE; BlockerTimeoutException not serializable

This commit is contained in:
Jan Bartel 2014-10-15 18:16:03 +11:00
parent 8a555e669a
commit 1729fb045c
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
jetty-util/src/main/java/org/eclipse/jetty/util/SharedBlockingCallback.java
View File

@ -102,7 +102,7 @@ public class SharedBlockingCallback
{ {
while (_blocker._state != IDLE) while (_blocker._state != IDLE)
{ {
if (idle>0) if (idle>0 && (idle < Long.MAX_VALUE/2))
{ {
// Wait a little bit longer than the blocker might block // Wait a little bit longer than the blocker might block
if (!_idle.await(idle*2,TimeUnit.MILLISECONDS)) if (!_idle.await(idle*2,TimeUnit.MILLISECONDS))
@ -207,7 +207,7 @@ public class SharedBlockingCallback
{ {
while (_state == null) while (_state == null)
{ {
if (idle>0) if (idle>0 && (idle < Long.MAX_VALUE/2))
{ {
// Wait a little bit longer than expected callback idle timeout // Wait a little bit longer than expected callback idle timeout
if (!_complete.await(idle+idle/2,TimeUnit.MILLISECONDS)) if (!_complete.await(idle+idle/2,TimeUnit.MILLISECONDS))
@ -296,7 +296,7 @@ public class SharedBlockingCallback
} }
} }
private class BlockerTimeoutException extends TimeoutException private static class BlockerTimeoutException extends TimeoutException
{ {
} }
} }