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

412418 HttpTransportOverSPDY fix race condition while sending push streams that could cause push data not to be sent. Fixes intermittent test issues in ReferrerPushStrategyTest

This commit is contained in:
Thomas Becker 2013-07-24 10:13:53 +02:00
parent eb126ebaee
commit 1ab5de8ecd
1 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
jetty-spdy/spdy-http-server/src/main/java/org/eclipse/jetty/spdy/server/http/HttpTransportOverSPDY.java
View File

@ -294,15 +294,27 @@ public class HttpTransportOverSPDY implements HttpTransport
private void sendNextResourceData() private void sendNextResourceData()
{ {
PushResource resource; LOG.debug("{} sendNextResourceData active: {}", hashCode(), active.get());
if (active.compareAndSet(false, true)) if (active.compareAndSet(false, true))
{ {
resource = queue.poll(); PushResource resource = queue.poll();
if (resource == null) if (resource != null)
return; {
LOG.debug("Opening new push channel for: {}", resource); LOG.debug("Opening new push channel for: {}", resource);
HttpChannelOverSPDY pushChannel = newHttpChannelOverSPDY(resource.getPushStream(), resource.getPushRequestHeaders()); HttpChannelOverSPDY pushChannel = newHttpChannelOverSPDY(resource.getPushStream(), resource.getPushRequestHeaders());
pushChannel.requestStart(resource.getPushRequestHeaders(), true); pushChannel.requestStart(resource.getPushRequestHeaders(), true);
return;
}
if (active.compareAndSet(true, false))
{
if (queue.peek() != null)
sendNextResourceData();
}
else
{
throw new IllegalStateException("active must not be false here! Concurrency bug!");
}
} }
} }
@ -336,6 +348,7 @@ public class HttpTransportOverSPDY implements HttpTransport
public void failed(Throwable x) public void failed(Throwable x)
{ {
LOG.debug("Creating push stream failed.", x); LOG.debug("Creating push stream failed.", x);
sendNextResourceData();
} }
}); });
} }
@ -343,7 +356,7 @@ public class HttpTransportOverSPDY implements HttpTransport
private void complete() private void complete()
{ {
if (!active.compareAndSet(true, false)) if (!active.compareAndSet(true, false))
LOG.warn("complete() called and active==false? That smells like a concurrency bug!", new IllegalStateException()); throw new IllegalStateException();
sendNextResourceData(); sendNextResourceData();
} }