Removed write queuing mechanism in ProxyToServerConnection

mederel · Sep 8, 2013 · b3c6f39 · b3c6f39
1 parent fd27035
commit b3c6f39
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 35 deletions.
diff --git a/src/main/java/org/littleshoot/proxy/impl/ClientToProxyConnection.java b/src/main/java/org/littleshoot/proxy/impl/ClientToProxyConnection.java
@@ -379,7 +379,7 @@ protected void disconnected() {
      */
     protected void serverConnectionFlowStarted(
             ProxyToServerConnection serverConnection) {
-        // stopReading();
+        stopReading();
         this.numberOfCurrentlyConnectingServers.incrementAndGet();
     }
 

diff --git a/src/main/java/org/littleshoot/proxy/impl/ProxyToServerConnection.java b/src/main/java/org/littleshoot/proxy/impl/ProxyToServerConnection.java
@@ -58,7 +58,7 @@
 @Sharable
 public class ProxyToServerConnection extends ProxyConnection<HttpResponse> {
     private static final int MAXIMUM_QUEUED_WRITES = 10;
-    
+
     private final ClientToProxyConnection clientConnection;
     private volatile TransportProtocol transportProtocol;
     private volatile InetSocketAddress remoteAddress;
@@ -109,12 +109,6 @@ public class ProxyToServerConnection extends ProxyConnection<HttpResponse> {
      */
     private volatile HttpResponse currentHttpResponse;
 
-    /**
-     * Holds writes that came in while we were connecting and need to be
-     * processed.
-     */
-    private final Queue<Object> queuedWrites = new ConcurrentLinkedQueue<Object>();
-
     /**
      * Create a new ProxyToServerConnection.
      * 
@@ -224,26 +218,20 @@ void write(Object msg) {
         } else {
             synchronized (connectLock) {
                 if (isConnecting()) {
-                    LOG.debug("Attempted to write while still in the process of connecting.");
-                    if (queuedWrites.size() < MAXIMUM_QUEUED_WRITES) {
-                        LOG.debug("Queuing write for later");
-                        queuedWrites.add(msg);
-                    } else {
-                        LOG.debug("Waiting for connection");
-                        try {
-                            connectLock.wait(30000);
-                        } catch (InterruptedException ie) {
-                            LOG.warn("Interrupted while waiting for connect monitor");
-                        }
-                        if (is(DISCONNECTED)) {
-                            LOG.debug("Connection failed while we were waiting for it, don't write");
-                            return;
-                        }
+                    LOG.debug("Attempted to write while still in the process of connecting, waiting for connection.");
+                    clientConnection.stopReading();
+                    try {
+                        connectLock.wait(30000);
+                    } catch (InterruptedException ie) {
+                        LOG.warn("Interrupted while waiting for connect monitor");
+                    }
+                    if (is(DISCONNECTED)) {
+                        LOG.debug("Connection failed while we were waiting for it, don't write");
+                        return;
                     }
-                    return;
                 }
             }
-            
+
             LOG.debug("Using existing connection to: {}", remoteAddress);
             doWrite(msg);
         }
@@ -258,7 +246,7 @@ protected void writeHttp(HttpObject httpObject) {
         }
         super.writeHttp(httpObject);
     }
-    
+
     /***************************************************************************
      * Lifecycle
      **************************************************************************/
@@ -670,15 +658,6 @@ void connectionSucceeded(boolean shouldForwardInitialRequest) {
         } else {
             LOG.debug("Dropping initial request: {}", initialRequest);
         }
-
-        if (!queuedWrites.isEmpty()) {
-            LOG.debug("Flushing queued writes");
-            Object queuedMsg;
-            while ((queuedMsg = queuedWrites.poll()) != null) {
-                LOG.debug("Flushing queued write: {}", queuedMsg);
-                doWrite(queuedMsg);
-            }
-        }
     }
 
     /**