QPID-3687 : Improve Java Broker performance

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

2 files changed, 30 insertions, 24 deletions

diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/client/failover/FailoverBehaviourTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/client/failover/FailoverBehaviourTest.java
index a5b9c618bc..45aa6a0e18 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/client/failover/FailoverBehaviourTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/client/failover/FailoverBehaviourTest.java
@@ -56,7 +56,7 @@ public class FailoverBehaviourTest extends FailoverBaseCase implements Connectio
     private static boolean CLUSTERED = Boolean.getBoolean("profile.clustered");
 
     /** Default number of messages to send before failover */
-    private static final int DEFAULT_NUMBER_OF_MESSAGES = 10;
+    private static final int DEFAULT_NUMBER_OF_MESSAGES = 40;
 
     /** Actual number of messages to send before failover */
     protected int _messageNumber = Integer.getInteger("profile.failoverMsgCount", DEFAULT_NUMBER_OF_MESSAGES);
@@ -1157,7 +1157,6 @@ public class FailoverBehaviourTest extends FailoverBaseCase implements Connectio
     {
         init(acknowledgeMode, false);
         _consumer.close();
-        QueueBrowser browser = _consumerSession.createBrowser((Queue) _destination);
         _connection.start();
 
         produceMessages(TEST_MESSAGE_FORMAT, _messageNumber, false);
@@ -1165,6 +1164,8 @@ public class FailoverBehaviourTest extends FailoverBaseCase implements Connectio
         {
             _producerSession.commit();
         }
+
+        QueueBrowser browser = _consumerSession.createBrowser((Queue) _destination);
         return browser;
     }
 
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/AMQConnectionTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/AMQConnectionTest.java
index 57ff6a4fa2..474a425b28 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/AMQConnectionTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/AMQConnectionTest.java
@@ -54,7 +54,14 @@ public class AMQConnectionTest extends QpidBrokerTestCase
         _topic = new AMQTopic(_connection.getDefaultTopicExchangeName(), new AMQShortString("mytopic"));
         _queue = new AMQQueue(_connection.getDefaultQueueExchangeName(), new AMQShortString("myqueue"));
     }
-    
+
+    @Override
+    protected void tearDown() throws Exception
+    {
+        _connection.close();
+        super.tearDown();    //To change body of overridden methods use File | Settings | File Templates.
+    }
+
     protected void createConnection() throws Exception
     {
         _connection = (AMQConnection) getConnection("guest", "guest");
@@ -67,16 +74,27 @@ public class AMQConnectionTest extends QpidBrokerTestCase
 
     public void testCreateQueueSession() throws JMSException
     {
-        _queueSession = _connection.createQueueSession(false, AMQSession.NO_ACKNOWLEDGE);
+        createQueueSession();
+    }
+
+    private void createQueueSession() throws JMSException
+    {
+        _queueSession =  _connection.createQueueSession(false, AMQSession.NO_ACKNOWLEDGE);
     }
 
     public void testCreateTopicSession() throws JMSException
     {
+        createTopicSession();
+    }
+
+    private void createTopicSession() throws JMSException
+    {
         _topicSession = _connection.createTopicSession(false, AMQSession.NO_ACKNOWLEDGE);
     }
 
     public void testTopicSessionCreateBrowser() throws JMSException
     {
+        createTopicSession();
         try
         {
             _topicSession.createBrowser(_queue);
@@ -94,6 +112,7 @@ public class AMQConnectionTest extends QpidBrokerTestCase
 
     public void testTopicSessionCreateQueue() throws JMSException
     {
+        createTopicSession();
         try
         {
             _topicSession.createQueue("abc");
@@ -111,6 +130,7 @@ public class AMQConnectionTest extends QpidBrokerTestCase
 
     public void testTopicSessionCreateTemporaryQueue() throws JMSException
     {
+        createTopicSession();
         try
         {
             _topicSession.createTemporaryQueue();
@@ -128,6 +148,7 @@ public class AMQConnectionTest extends QpidBrokerTestCase
 
     public void testQueueSessionCreateTemporaryTopic() throws JMSException
     {
+        createQueueSession();
         try
         {
             _queueSession.createTemporaryTopic();
@@ -145,6 +166,7 @@ public class AMQConnectionTest extends QpidBrokerTestCase
 
     public void testQueueSessionCreateTopic() throws JMSException
     {
+        createQueueSession();
         try
         {
             _queueSession.createTopic("abc");
@@ -162,6 +184,7 @@ public class AMQConnectionTest extends QpidBrokerTestCase
 
     public void testQueueSessionDurableSubscriber() throws JMSException
     {
+        createQueueSession();
         try
         {
             _queueSession.createDurableSubscriber(_topic, "abc");
@@ -179,6 +202,7 @@ public class AMQConnectionTest extends QpidBrokerTestCase
 
     public void testQueueSessionUnsubscribe() throws JMSException
     {
+        createQueueSession();
         try
         {
             _queueSession.unsubscribe("abc");
@@ -243,25 +267,6 @@ public class AMQConnectionTest extends QpidBrokerTestCase
         assertNotNull("Consumer B should have received the message",msg);
     }
     
-    public void testGetChannelID() throws Exception
-    {
-        long maxChannelID = _connection.getMaximumChannelCount();
-        if (isBroker010())
-        {
-            //Usable numbers are 0 to N-1 when using 0-10
-            //and 1 to N for 0-8/0-9
-            maxChannelID = maxChannelID-1;
-        }
-        for (int j = 0; j < 3; j++)
-        {
-            int i = isBroker010() ? 0 : 1;
-            for ( ; i <= maxChannelID; i++)
-            {
-                int id = _connection.getNextChannelID();
-                assertEquals("Unexpected number on iteration "+j, i, id);
-                _connection.deregisterSession(id);
-            }
-        }
-    }
+
 
 }