/*
 * Copyright 2015 Ben Ashford
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 *     http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */

package jresp.pool;

import jresp.Connection;
import jresp.ConnectionException;
import jresp.Responses;
import jresp.protocol.RespType;

import java.io.IOException;
import java.util.ArrayDeque;
import java.util.Deque;

/**
 * A connection used solely for commands that have a single response to each request
 */
public class SingleCommandConnection {
    private Connection connection;

    private Deque<Responses> responseQueue = new ArrayDeque<>();

    public SingleCommandConnection(Connection connection) throws IOException, ConnectionException {
        this.connection = connection;
        this.connection.start(resp -> {
            synchronized (responseQueue) {
                responseQueue.pop().responseReceived(resp);
            }
        });
    }

    public void write(RespType command, Responses responses) {
        synchronized (responseQueue) {
            responseQueue.add(responses);
            connection.write(command);
        }
    }
}

@@ -988,16 +988,22 @@
 private 
+final 
 Deque%3CRe
@@ -1047,16 +1047,16 @@
 ue%3C%3E();%0A
-
 %0A    pub
@@ -1226,16 +1226,56 @@
 sp -%3E %7B%0A
+            Responses respondTo = null;%0A
         
@@ -1317,32 +1317,36 @@
                 
+if (
 responseQueue.po
@@ -1347,51 +1347,239 @@
 eue.
-pop().responseReceived(resp);%0A            %7D
+isEmpty()) %7B%0A                    throw new IllegalStateException(%22Got an unexpected response: %22 + resp);%0A                %7D%0A                respondTo = responseQueue.pop();%0A            %7D%0A            respondTo.responseReceived(resp);
 %0A   

Put a sharper-edge on a potential failure-case when requests and responses become out-of-sync.