Return-Path: Delivered-To: apmail-activemq-commits-archive@www.apache.org Received: (qmail 57791 invoked from network); 9 Jul 2009 16:00:44 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 9 Jul 2009 16:00:44 -0000 Received: (qmail 54053 invoked by uid 500); 9 Jul 2009 16:00:54 -0000 Delivered-To: apmail-activemq-commits-archive@activemq.apache.org Received: (qmail 53996 invoked by uid 500); 9 Jul 2009 16:00:54 -0000 Mailing-List: contact commits-help@activemq.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@activemq.apache.org Delivered-To: mailing list commits@activemq.apache.org Received: (qmail 53987 invoked by uid 99); 9 Jul 2009 16:00:54 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 09 Jul 2009 16:00:54 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 09 Jul 2009 16:00:50 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id EE90423888C8; Thu, 9 Jul 2009 16:00:29 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: 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 Date: Thu, 09 Jul 2009 16:00:29 -0000 To: commits@activemq.apache.org From: gtully@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090709160029.EE90423888C8@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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); }