Fixed bug in AsyncEndPoint.hasProgressed() handling: the progressing status

must be remembered until a call to hasProgressed() is made.
Additional code cleanups.

jetty-client/src/main/java/org/eclipse/jetty/client/AsyncHttpConnection.java

@@ -122,16 +122,16 @@ public class AsyncHttpConnection extends AbstractHttpConnection implements Async
                         exchange.getEventListener().onRequestComplete();
                     }
 
-                    // Flush output
-                    _endp.flush();
-
                     // Read any input that is available
                     if (!_parser.isComplete() && _parser.parseAvailable())
                     {
-                        LOG.debug("parsed");
+                        LOG.debug("parsed {}",exchange);
                         progress=true;
                     }
 
+                    // Flush output
+                    _endp.flush();
+
                     // Has any IO been done by the endpoint itself since last loop
                     if (_asyncEndp.hasProgressed())
                     {

jetty-client/src/main/java/org/eclipse/jetty/client/BlockingHttpConnection.java

@@ -31,16 +31,14 @@ import org.eclipse.jetty.util.log.Logger;
  */
 public class BlockingHttpConnection extends AbstractHttpConnection
 {
-
     private static final Logger LOG = Log.getLogger(BlockingHttpConnection.class);
 
     private boolean _requestComplete;
-    private int _status;
     private Buffer _requestContentChunk;
 
-    BlockingHttpConnection(Buffers requestBuffers, Buffers responseBuffers, EndPoint endp)
+    BlockingHttpConnection(Buffers requestBuffers, Buffers responseBuffers, EndPoint endPoint)
     {
-        super(requestBuffers,responseBuffers,endp);
+        super(requestBuffers, responseBuffers, endPoint);
     }
 
     protected void reset() throws IOException
@@ -131,15 +129,14 @@ public class BlockingHttpConnection extends AbstractHttpConnection
                         exchange.getEventListener().onRequestComplete();
                     }
 
-                    // Flush output
-                    _endp.flush();
-
                     // Read any input that is available
                     if (!_parser.isComplete() && _parser.parseAvailable())
                     {
                         LOG.debug("parsed");
                     }
 
+                    // Flush output
+                    _endp.flush();
                 }
                 catch (Throwable e)
                 {
@@ -231,7 +228,6 @@ public class BlockingHttpConnection extends AbstractHttpConnection
                             if (_exchange==null && !isReserved())  // TODO how do we return switched connections?
                                 _destination.returnConnection(this, !persistent);
                         }
-
                     }
                 }
             }
@@ -245,14 +241,6 @@ public class BlockingHttpConnection extends AbstractHttpConnection
         return connection;
     }
 
-
-    public void onInputShutdown() throws IOException
-    {
-        if (_generator.isIdle())
-            _endp.shutdownOutput();
-    }
-
-
     @Override
     public boolean send(HttpExchange ex) throws IOException
     {

jetty-client/src/main/java/org/eclipse/jetty/client/SelectConnector.java

@@ -169,10 +169,8 @@ class SelectConnector extends AbstractLifeCycle implements HttpClient.Connector,
             // key should have destination at this point (will be replaced by endpoint after this call)
             HttpDestination dest=(HttpDestination)key.attachment();
 
-            AsyncEndPoint ep=null;
+            SelectChannelEndPoint scep = new SelectChannelEndPoint(channel, selectSet, key, (int)_httpClient.getIdleTimeout());
-
+            AsyncEndPoint ep = scep;
-            SelectChannelEndPoint scep= new SelectChannelEndPoint(channel, selectSet, key, (int)_httpClient.getIdleTimeout());
-            ep = scep;
 
             if (dest.isSecure())
             {
@@ -276,10 +274,10 @@ class SelectConnector extends AbstractLifeCycle implements HttpClient.Connector,
 
         public void upgrade()
         {
-            AsyncHttpConnection connection = (AsyncHttpConnection) ((SelectChannelEndPoint)_endp).getConnection();
+            AsyncHttpConnection connection = (AsyncHttpConnection)_endp.getConnection();
 
             SslConnection sslConnection = new SslConnection(_engine,_endp);
-            ((SelectChannelEndPoint)_endp).setConnection(sslConnection);
+            _endp.setConnection(sslConnection);
 
             _endp=sslConnection.getSslEndPoint();
             sslConnection.getSslEndPoint().setConnection(connection);

jetty-io/src/main/java/org/eclipse/jetty/io/nio/SslConnection.java

@@ -178,7 +178,9 @@ public class SslConnection extends AbstractConnection implements AsyncConnection
 
                 // If we are handshook let the delegate connection
                 if (_engine.getHandshakeStatus()!=HandshakeStatus.NOT_HANDSHAKING)
-                    progress|=process(null,null);
+                {
+                    progress=process(null,null);
+                }
                 else
                 {
                     // handle the delegate connection
@@ -389,7 +391,8 @@ public class SslConnection extends AbstractConnection implements AsyncConnection
         finally
         {
             releaseBuffers();
-            _progressed.set(some_progress);
+            if (some_progress)
+                _progressed.set(true);
         }
         return some_progress;
     }
@@ -582,11 +585,6 @@ public class SslConnection extends AbstractConnection implements AsyncConnection
             return _engine;
         }
 
-        public SslConnection getSslConnection()
-        {
-            return SslConnection.this;
-        }
-
         public void shutdownOutput() throws IOException
         {
             synchronized (SslConnection.this)
@@ -643,10 +641,9 @@ public class SslConnection extends AbstractConnection implements AsyncConnection
 
         public int flush(Buffer buffer) throws IOException
         {
-            int size=buffer.length();
+            int size = buffer.length();
-            process(null,buffer);
+            process(null, buffer);
-            int flushed=size-buffer.length();
+            return size-buffer.length();
-            return flushed;
         }
 
         public int flush(Buffer header, Buffer buffer, Buffer trailer) throws IOException

jetty-server/src/main/java/org/eclipse/jetty/server/AsyncHttpConnection.java

@@ -79,7 +79,6 @@ public class AsyncHttpConnection extends AbstractHttpConnection implements Async
                     // Has any IO been done by the endpoint itself since last loop
                     if (_asyncEndp.hasProgressed())
                         progress=true;
-
                 }
                 catch (HttpException e)
                 {
@@ -122,6 +121,7 @@ public class AsyncHttpConnection extends AbstractHttpConnection implements Async
                     {
                         // The request is suspended, so even though progress has been made, break the while loop
                         LOG.debug("suspended {}",this);
+                        // TODO: breaking inside finally blocks is bad: rethink how we should exit from here
                         break;
                     }
                 }

jetty-server/src/main/java/org/eclipse/jetty/server/BlockingHttpConnection.java

@@ -31,32 +31,26 @@ public class BlockingHttpConnection extends AbstractHttpConnection
 {
     private static final Logger LOG = Log.getLogger(BlockingHttpConnection.class);
 
-    private volatile boolean _handling;
-
     public BlockingHttpConnection(Connector connector, EndPoint endpoint, Server server)
     {
         super(connector,endpoint,server);
     }
 
-
     public BlockingHttpConnection(Connector connector, EndPoint endpoint, Server server, Parser parser, Generator generator, Request request)
     {
         super(connector,endpoint,server,parser,generator,request);
     }
 
-
     @Override
     protected void handleRequest() throws IOException
     {
         super.handleRequest();
     }
 
-
     public Connection handle() throws IOException
     {
         Connection connection = this;
 
-        boolean progress=true;
         try
         {
             setCurrentConnection(this);
@@ -67,17 +61,16 @@ public class BlockingHttpConnection extends AbstractHttpConnection
             {
                 try
                 {
-                    progress=false;
                     // If we are not ended then parse available
                     if (!_parser.isComplete() && !_endp.isInputShutdown())
-                        progress |= _parser.parseAvailable();
+                        _parser.parseAvailable();
 
                     // Do we have more generating to do?
                     // Loop here because some writes may take multiple steps and
                     // we need to flush them all before potentially blocking in the
                     // next loop.
                     if (_generator.isCommitted() && !_generator.isComplete() && !_endp.isOutputShutdown())
-                        progress |= _generator.flushBuffer()>0;
+                        _generator.flushBuffer();
 
                     // Flush buffers
                     _endp.flush();
@@ -100,9 +93,7 @@ public class BlockingHttpConnection extends AbstractHttpConnection
                     if (_parser.isComplete() && _generator.isComplete())
                     {
                         // Reset the parser/generator
-                        progress=true;
                         reset();
-                        _endp.flush();
 
                         // look for a switched connection instance?
                         if (_response.getStatus()==HttpStatus.SWITCHING_PROTOCOLS_101)
@@ -121,6 +112,8 @@ public class BlockingHttpConnection extends AbstractHttpConnection
                     }
                 }
             }
+
+            return connection;
         }
         finally
         {
@@ -128,7 +121,5 @@ public class BlockingHttpConnection extends AbstractHttpConnection
             _parser.returnBuffers();
             _generator.returnBuffers();
         }
-        return connection;
     }
-
 }

jetty-websocket/src/main/java/org/eclipse/jetty/websocket/WebSocketConnectionD13.java

@@ -18,7 +18,6 @@ import java.io.UnsupportedEncodingException;
 import java.security.MessageDigest;
 import java.util.Collections;
 import java.util.List;
-
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
@@ -248,6 +247,8 @@ public class WebSocketConnectionD13 extends AbstractConnection implements WebSoc
 
                 progress = flushed>0 || filled>0;
 
+                _endp.flush();
+
                 if (_endp instanceof AsyncEndPoint && ((AsyncEndPoint)_endp).hasProgressed())
                     progress=true;
             }
@@ -876,7 +877,7 @@ public class WebSocketConnectionD13 extends AbstractConnection implements WebSoc
 
                     default:
                         errorClose(WebSocketConnectionD13.CLOSE_PROTOCOL,"Bad opcode 0x"+Integer.toHexString(opcode));
-                        return;
+                        break;
                 }
             }
             catch(Utf8Appendable.NotUtf8Exception notUtf8)