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

435322 Added a idleTimeout to the SharedBlockerCallback

This commit is contained in:
Greg Wilkins 2014-09-04 09:30:21 +10:00
parent ed8abd1d53
commit 610bac49b9
2 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
jetty-spdy/spdy-http-server/src/main/java/org/eclipse/jetty/spdy/server/http/HttpChannelOverSPDY.java
View File

@ -52,6 +52,12 @@ public class HttpChannelOverSPDY extends HttpChannel<DataInfo>
this.stream = stream;
}
@Override
public long getIdleTimeout()
{
return stream.getIdleTimeout();
}
@Override
public boolean headerComplete()
{

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

@ -104,7 +104,8 @@ public class SharedBlockingCallback
{
if (idle>0)
{
if (!_idle.await(idle,TimeUnit.MILLISECONDS))
// Wait a little bit longer than the blocker might block
if (!_idle.await(idle*2,TimeUnit.MILLISECONDS))
throw new IOException(new TimeoutException());
}
else
@ -114,12 +115,7 @@ public class SharedBlockingCallback
}
catch (final InterruptedException e)
{
throw new InterruptedIOException()
{
{
initCause(e);
}
};
throw new InterruptedIOException();
}
finally
{
@ -213,7 +209,8 @@ public class SharedBlockingCallback
{
if (idle>0)
{
if (!_complete.await(idle,TimeUnit.MILLISECONDS))
// Wait a little bit longer than expected callback idle timeout
if (!_complete.await(idle+idle/2,TimeUnit.MILLISECONDS))
// The callback has not arrived in sufficient time.
// We will synthesize a TimeoutException
_state=new BlockerTimeoutException();
@ -238,12 +235,7 @@ public class SharedBlockingCallback
}
catch (final InterruptedException e)
{
throw new InterruptedIOException()
{
{
initCause(e);
}
};
throw new InterruptedIOException();
}
finally
{