diff options
| author | Simone Bordet | 2015-03-16 07:17:25 +0000 |
|---|---|---|
| committer | Simone Bordet | 2015-03-16 07:17:25 +0000 |
| commit | 81f29576e6b7a1ee1da32b19843801becd000412 (patch) | |
| tree | 2ad7cfa0ddeaea7cfef0cb99857894c247e08f1e | |
| parent | 4f0c63734c1f0fd0e8b757b8e230954efdcf77a5 (diff) | |
| download | org.eclipse.jetty.project-81f29576e6b7a1ee1da32b19843801becd000412.tar.gz org.eclipse.jetty.project-81f29576e6b7a1ee1da32b19843801becd000412.tar.xz org.eclipse.jetty.project-81f29576e6b7a1ee1da32b19843801becd000412.zip | |
Prevented NPE in abort().
| -rw-r--r-- | jetty-http2/http2-server/src/main/java/org/eclipse/jetty/http2/server/HttpTransportOverHTTP2.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/jetty-http2/http2-server/src/main/java/org/eclipse/jetty/http2/server/HttpTransportOverHTTP2.java b/jetty-http2/http2-server/src/main/java/org/eclipse/jetty/http2/server/HttpTransportOverHTTP2.java index a86e8c5230..144f1c0dc2 100644 --- a/jetty-http2/http2-server/src/main/java/org/eclipse/jetty/http2/server/HttpTransportOverHTTP2.java +++ b/jetty-http2/http2-server/src/main/java/org/eclipse/jetty/http2/server/HttpTransportOverHTTP2.java @@ -205,9 +205,11 @@ public class HttpTransportOverHTTP2 implements HttpTransport @Override public void abort(Throwable failure) { + IStream stream = this.stream; if (LOG.isDebugEnabled()) - LOG.debug("HTTP2 Response #{} aborted", stream.getId()); - stream.reset(new ResetFrame(stream.getId(), ErrorCode.INTERNAL_ERROR.code), Callback.Adapter.INSTANCE); + LOG.debug("HTTP2 Response #{} aborted", stream == null ? -1 : stream.getId()); + if (stream != null) + stream.reset(new ResetFrame(stream.getId(), ErrorCode.INTERNAL_ERROR.code), Callback.Adapter.INSTANCE); } private class CommitCallback implements Callback |