Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimone Bordet2015-02-15 19:51:49 +0000
committerSimone Bordet2015-02-15 19:51:49 +0000
commit28b9a0927c251079403aecd0d03b678ed4c0d555 (patch)
tree9c2cce5ee1007db5dd6fb191b550ba4d2877344d /jetty-http2
parentc52f100ec35e4721a0e6f94a41d29768e20df19a (diff)
parentffa32dfae767a8f28fa99a09bdb03e3a3c95296e (diff)
downloadorg.eclipse.jetty.project-28b9a0927c251079403aecd0d03b678ed4c0d555.tar.gz
org.eclipse.jetty.project-28b9a0927c251079403aecd0d03b678ed4c0d555.tar.xz
org.eclipse.jetty.project-28b9a0927c251079403aecd0d03b678ed4c0d555.zip
Merged branch 'jetty-9.2.x' into 'master'.
Diffstat (limited to 'jetty-http2')
-rw-r--r--jetty-http2/http2-http-client-transport/src/main/java/org/eclipse/jetty/http2/client/http/HttpChannelOverHTTP2.java2
1 files changed, 0 insertions, 2 deletions
diff --git a/jetty-http2/http2-http-client-transport/src/main/java/org/eclipse/jetty/http2/client/http/HttpChannelOverHTTP2.java b/jetty-http2/http2-http-client-transport/src/main/java/org/eclipse/jetty/http2/client/http/HttpChannelOverHTTP2.java
index 63577d250e..267c0e61d3 100644
--- a/jetty-http2/http2-http-client-transport/src/main/java/org/eclipse/jetty/http2/client/http/HttpChannelOverHTTP2.java
+++ b/jetty-http2/http2-http-client-transport/src/main/java/org/eclipse/jetty/http2/client/http/HttpChannelOverHTTP2.java
@@ -69,8 +69,6 @@ public class HttpChannelOverHTTP2 extends HttpChannel
{
boolean sendAborted = sender.abort(cause);
boolean receiveAborted = receiver.abort(cause);
- // Variables cannot be inlined, otherwise abort
- // calls may not be executed due to short-circuit.
return sendAborted || receiveAborted;
}

Back to the top