added a test for message send followed by immediate connection close; fixed connection close handshaking

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@627157 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 110 insertions, 0 deletions

diff --git a/java/client/src/main/java/org/apache/qpidity/nclient/Client.java b/java/client/src/main/java/org/apache/qpidity/nclient/Client.java
index 51a052bed5..ad47e14fde 100644
--- a/java/client/src/main/java/org/apache/qpidity/nclient/Client.java
+++ b/java/client/src/main/java/org/apache/qpidity/nclient/Client.java
@@ -16,6 +16,7 @@ import org.apache.qpidity.nclient.impl.ClientSessionDelegate;
 import org.apache.qpidity.transport.Channel;
 import org.apache.qpidity.transport.Connection;
 import org.apache.qpidity.transport.ConnectionClose;
+import org.apache.qpidity.transport.ConnectionCloseOk;
 import org.apache.qpidity.transport.ConnectionDelegate;
 import org.apache.qpidity.transport.ConnectionEvent;
 import org.apache.qpidity.transport.ProtocolHeader;
@@ -33,6 +34,9 @@ public class Client implements org.apache.qpidity.nclient.Connection
     private ClosedListener _closedListner;
     private final Lock _lock = new ReentrantLock();
     private static Logger _logger = LoggerFactory.getLogger(Client.class);
+    private Condition closeOk;
+    private boolean closed = false;
+
     /**
      *
      * @return returns a new connection to the broker.
@@ -45,6 +49,7 @@ public class Client implements org.apache.qpidity.nclient.Connection
     public void connect(String host, int port,String virtualHost,String username, String password) throws QpidException
     {
         Condition negotiationComplete = _lock.newCondition();
+        closeOk = _lock.newCondition();
         _lock.lock();
 
         ConnectionDelegate connectionDelegate = new ConnectionDelegate()
@@ -76,6 +81,21 @@ public class Client implements org.apache.qpidity.nclient.Connection
                 }
             }
 
+            @Override public void connectionCloseOk(Channel context, ConnectionCloseOk struct)
+            {
+                _lock.lock();
+                try
+                {
+                    closed = true;
+                    this.receivedClose = true;
+                    closeOk.signalAll();
+                }
+                finally
+                {
+                    _lock.unlock();
+                }
+            }
+
             @Override public void connectionClose(Channel context, ConnectionClose connectionClose)
             {
                 ErrorCode errorCode = ErrorCode.get(connectionClose.getReplyCode());
@@ -179,6 +199,24 @@ public class Client implements org.apache.qpidity.nclient.Connection
     {
         Channel ch = _conn.getChannel(0);
         ch.connectionClose(0, "client is closing", 0, 0);
+        _lock.lock();
+        try
+        {
+            try {
+                while (!closed)
+                {
+                    closeOk.await();
+                }
+            }
+            catch (InterruptedException e)
+            {
+                // do nothing
+            }
+        }
+        finally
+        {
+            _lock.unlock();
+        }
         _conn.close();
     }
 
diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/client/connection/ConnectionCloseTest.java b/java/client/src/test/java/org/apache/qpid/test/unit/client/connection/ConnectionCloseTest.java
new file mode 100644
index 0000000000..20443944d2
--- /dev/null
+++ b/java/client/src/test/java/org/apache/qpid/test/unit/client/connection/ConnectionCloseTest.java
@@ -0,0 +1,72 @@
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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 org.apache.qpid.test.unit.client.connection;
+
+import org.apache.qpid.testutil.QpidTestCase;
+import org.apache.qpidity.transport.util.Logger;
+
+import javax.jms.Connection;
+import javax.jms.MessageConsumer;
+import javax.jms.MessageProducer;
+import javax.jms.Queue;
+import javax.jms.Session;
+import javax.jms.TextMessage;
+
+/**
+ * ConnectionCloseTest
+ *
+ */
+
+public class ConnectionCloseTest extends QpidTestCase
+{
+
+    private static final Logger log = Logger.get(ConnectionCloseTest.class);
+
+    public void testSendReceiveClose() throws Exception
+    {
+        for (int i = 0; i < 500; i++)
+        {
+            if ((i % 10) == 0)
+            {
+                log.warn("%d messages sent and received", i);
+            }
+
+            Connection receiver = getConnection();
+            receiver.start();
+            Session rssn = receiver.createSession(false, Session.AUTO_ACKNOWLEDGE);
+            Queue queue = rssn.createQueue("connection-close-test-queue");
+            MessageConsumer cons = rssn.createConsumer(queue);
+
+            Connection sender = getConnection();
+            sender.start();
+            Session sssn = sender.createSession(false, Session.AUTO_ACKNOWLEDGE);
+            MessageProducer prod = sssn.createProducer(queue);
+            prod.send(sssn.createTextMessage("test"));
+            sender.close();
+
+            TextMessage m = (TextMessage) cons.receive(2000);
+            assertNotNull("message was lost", m);
+            assertEquals(m.getText(), "test");
+            receiver.close();
+        }
+    }
+
+}