Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.

2018-10-10 10:27:31 +02:00 · 2018-10-10 10:27:31 +02:00 · eaddaf64a8
parent 78238a8a71 34511670d1
commit eaddaf64a8
1 changed files with 3 additions and 2 deletions
--- a/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/HTTP2Stream.java
+++ b/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/HTTP2Stream.java
@ -628,13 +628,14 @@ public class HTTP2Stream extends IdleTimeout implements IStream, Callback, Dumpa
    @Override
    public String toString()
    {
-        return String.format("%s@%x#%d{sendWindow=%s,recvWindow=%s,reset=%b,%s,age=%d,attachment=%s}",
+        return String.format("%s@%x#%d{sendWindow=%s,recvWindow=%s,reset=%b/%b,%s,age=%d,attachment=%s}",
                getClass().getSimpleName(),
                hashCode(),
                getId(),
                sendWindow,
                recvWindow,
-                isReset(),
+                localReset,
+                remoteReset,
                closeState,
                TimeUnit.NANOSECONDS.toMillis(System.nanoTime() - timeStamp),
                attachment);