You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by gt...@apache.org on 2009/07/09 18:00:29 UTC

svn commit: r792591 - in /activemq/trunk/activemq-core/src: main/java/org/apache/activemq/broker/BrokerService.java test/java/org/apache/activemq/broker/BrokerTest.java

Author: gtully
Date: Thu Jul  9 16:00:29 2009
New Revision: 792591

URL: http://svn.apache.org/viewvc?rev=792591&view=rev
Log:
resolve https://issues.apache.org/activemq/browse/AMQ-2321

Modified:
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/BrokerService.java
    activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/BrokerTest.java

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/BrokerService.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/BrokerService.java?rev=792591&r1=792590&r2=792591&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/BrokerService.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/BrokerService.java Thu Jul  9 16:00:29 2009
@@ -960,7 +960,7 @@
     }
 
     public Service[] getServices() {
-        return (Service[]) services.toArray();
+        return (Service[]) services.toArray(new Service[0]);
     }
 
     /**

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/BrokerTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/BrokerTest.java?rev=792591&r1=792590&r2=792591&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/BrokerTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/BrokerTest.java Thu Jul  9 16:00:29 2009
@@ -1741,6 +1741,10 @@
         connection.request(createAck(consumerInfo, m3, 1, MessageAck.DELIVERED_ACK_TYPE));
     }
 
+    public void testGetServices() throws Exception {
+        assertTrue(broker.getServices().length != 0);
+    }
+    
     public static Test suite() {
         return suite(BrokerTest.class);
     }