2 files changed, 82 insertions, 0 deletions

diff --git a/java/systests/src/main/java/org/apache/qpid/client/SessionCreateTest.java b/java/systests/src/main/java/org/apache/qpid/client/SessionCreateTest.java
new file mode 100644
index 0000000000..1672c2a828
--- /dev/null
+++ b/java/systests/src/main/java/org/apache/qpid/client/SessionCreateTest.java
@@ -0,0 +1,63 @@
+/*
+ *  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.client;
+
+import javax.jms.Connection;
+import javax.jms.Session;
+import javax.naming.Context;
+
+import org.apache.qpid.test.utils.QpidTestCase;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+
+/**
+ * Class to check that session creation on a connection has no accidental limit
+ */
+public class SessionCreateTest extends QpidTestCase
+{
+    private static final Logger _logger = LoggerFactory.getLogger(MessageListenerTest.class);
+
+    Context _context;
+
+    private Connection _clientConnection;
+    protected int maxSessions = 65555;
+
+    public void testSessionCreationLimit() throws Exception
+    {
+        // Create Client
+        _clientConnection = getConnection("guest", "guest");
+
+        _clientConnection.start();
+
+        for (int i=0; i < maxSessions; i++)
+        {
+            Session sess = _clientConnection.createSession(false, Session.AUTO_ACKNOWLEDGE);
+            assertNotNull(sess);
+            sess.close();
+            System.out.println("created session: " + i); 
+        }
+
+        _clientConnection.close();
+
+    }
+
+}
\ No newline at end of file
diff --git a/java/systests/src/main/java/org/apache/qpid/test/unit/client/AMQConnectionTest.java b/java/systests/src/main/java/org/apache/qpid/test/unit/client/AMQConnectionTest.java
index 55750dcafb..cbeb16f340 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/unit/client/AMQConnectionTest.java
+++ b/java/systests/src/main/java/org/apache/qpid/test/unit/client/AMQConnectionTest.java
@@ -30,6 +30,7 @@ import javax.jms.TextMessage;
 import javax.jms.TopicSession;
 
 import org.apache.qpid.client.AMQConnection;
+import org.apache.qpid.client.AMQConnectionDelegate_0_10;
 import org.apache.qpid.client.AMQQueue;
 import org.apache.qpid.client.AMQSession;
 import org.apache.qpid.client.AMQTopic;
@@ -244,6 +245,24 @@ public class AMQConnectionTest extends QpidTestCase
         }
     }
     
+    public void testGetChannelID()
+    {
+        int maxChannelID = 65536;
+        if (isBroker010())
+        {
+            maxChannelID = Integer.MAX_VALUE+1;
+        }
+        for (int j = 0; j < 3; j++)
+        {
+            for (int i = 1; i < maxChannelID; i++)
+            {
+                int id = _connection.getNextChannelID();
+                assertEquals("On iterartion "+j, i, id);
+                _connection.deregisterSession(id);
+            }
+        }
+    }
+    
     public static junit.framework.Test suite()
     {
         return new junit.framework.TestSuite(AMQConnectionTest.class);