aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Becker2013-06-14 07:27:03 (EDT)
committerThomas Becker2013-06-14 07:27:16 (EDT)
commit6d75e18661415d2617b5e91ed2d9758c64e218d5 (patch)
tree15bd6c20564d23c5d32b9ea5e1be3f8d30cf1e24
parent762e91efbe6dccadb8e07aac280a942c8f5de458 (diff)
downloadorg.eclipse.jetty.project-6d75e18661415d2617b5e91ed2d9758c64e218d5.zip
org.eclipse.jetty.project-6d75e18661415d2617b5e91ed2d9758c64e218d5.tar.gz
org.eclipse.jetty.project-6d75e18661415d2617b5e91ed2d9758c64e218d5.tar.bz2
410799 errors while creating push streams in HttpTransportOverSPDY are now logged to debug instead of warn
-rw-r--r--jetty-spdy/spdy-http-server/src/main/java/org/eclipse/jetty/spdy/server/http/HttpTransportOverSPDY.java15
1 files changed, 10 insertions, 5 deletions
diff --git a/jetty-spdy/spdy-http-server/src/main/java/org/eclipse/jetty/spdy/server/http/HttpTransportOverSPDY.java b/jetty-spdy/spdy-http-server/src/main/java/org/eclipse/jetty/spdy/server/http/HttpTransportOverSPDY.java
index b67bfff..fc83aef 100644
--- a/jetty-spdy/spdy-http-server/src/main/java/org/eclipse/jetty/spdy/server/http/HttpTransportOverSPDY.java
+++ b/jetty-spdy/spdy-http-server/src/main/java/org/eclipse/jetty/spdy/server/http/HttpTransportOverSPDY.java
@@ -23,7 +23,6 @@ import java.nio.ByteBuffer;
import java.util.Queue;
import java.util.Set;
import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
import java.util.concurrent.atomic.AtomicBoolean;
import org.eclipse.jetty.http.HttpField;
@@ -86,14 +85,14 @@ public class HttpTransportOverSPDY implements HttpTransport
return requestHeaders;
}
-
+
@Override
public void send(ByteBuffer responseBodyContent, boolean lastContent, Callback callback)
{
// TODO can this be more efficient?
- send(null,responseBodyContent, lastContent, callback);
+ send(null, responseBodyContent, lastContent, callback);
}
-
+
@Override
public void send(HttpGenerator.ResponseInfo info, ByteBuffer content, boolean lastContent, Callback callback)
{
@@ -306,7 +305,7 @@ public class HttpTransportOverSPDY implements HttpTransport
final Fields pushHeaders = createPushHeaders(scheme, host, pushResource);
final Fields pushRequestHeaders = createRequestHeaders(scheme, host, uri, pushResource);
- stream.push(new PushInfo(pushHeaders, false), new Promise.Adapter<Stream>()
+ stream.push(new PushInfo(pushHeaders, false), new Promise<Stream>()
{
@Override
public void succeeded(Stream pushStream)
@@ -315,6 +314,12 @@ public class HttpTransportOverSPDY implements HttpTransport
queue.offer(new PushResource(pushStream, pushRequestHeaders));
sendNextResourceData();
}
+
+ @Override
+ public void failed(Throwable x)
+ {
+ LOG.debug("Creating push stream failed.", x);
+ }
});
}