Issue #4331 Close Complete

minor cleanups Signed-off-by: Greg Wilkins <gregw@webtide.com>
jetty · Dec 6, 2019 · d53194b · d53194b
1 parent b5971a6
commit d53194b
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 9 deletions.
diff --git a/jetty-http2/http2-client/src/test/java/org/eclipse/jetty/http2/client/AsyncIOTest.java b/jetty-http2/http2-client/src/test/java/org/eclipse/jetty/http2/client/AsyncIOTest.java
@@ -41,7 +41,6 @@
 import org.eclipse.jetty.http2.api.Stream;
 import org.eclipse.jetty.http2.frames.DataFrame;
 import org.eclipse.jetty.http2.frames.HeadersFrame;
-import org.eclipse.jetty.http2.frames.ResetFrame;
 import org.eclipse.jetty.http2.frames.SettingsFrame;
 import org.eclipse.jetty.server.HttpOutput;
 import org.eclipse.jetty.util.Callback;
@@ -279,11 +278,6 @@ public void onClosed(Stream stream)
             {
                 latch.countDown();
             }
-
-            @Override
-            public void onReset(Stream stream, ResetFrame frame)
-            {
-            }
         });
         assertTrue(latch.await(5, TimeUnit.SECONDS));
     }

diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java b/jetty-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java
@@ -154,7 +154,6 @@ default void resetBuffer() throws IllegalStateException
     private final HttpChannelState _channelState;
     private final SharedBlockingCallback _writeBlocker;
     private State _state = State.OPEN;
-    private boolean _completing = false;
     private Interceptor _interceptor;
     private long _written;
     private long _flushed;
@@ -1114,7 +1113,6 @@ public void recycle()
         synchronized (_channelState)
         {
             _state = State.OPEN;
-            _completing = false;
             _interceptor = _channel;
             HttpConfiguration config = _channel.getHttpConfiguration();
             _bufferSize = config.getOutputBufferSize();

diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/Iso88591HttpWriter.java b/jetty-server/src/main/java/org/eclipse/jetty/server/Iso88591HttpWriter.java
@@ -51,7 +51,7 @@ public void write(char[] s, int offset, int length) throws IOException
         while (length > 0)
         {
             _bytes.reset();
-            int chars = length > MAX_OUTPUT_CHARS ? MAX_OUTPUT_CHARS : length;
+            int chars = Math.min(length, MAX_OUTPUT_CHARS);
 
             byte[] buffer = _bytes.getBuf();
             int bytes = _bytes.getCount();