Return-Path: Delivered-To: apmail-activemq-commits-archive@www.apache.org Received: (qmail 68567 invoked from network); 17 Oct 2008 15:23:33 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 17 Oct 2008 15:23:33 -0000 Received: (qmail 22585 invoked by uid 500); 17 Oct 2008 15:23:35 -0000 Delivered-To: apmail-activemq-commits-archive@activemq.apache.org Received: (qmail 22560 invoked by uid 500); 17 Oct 2008 15:23:35 -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 22551 invoked by uid 99); 17 Oct 2008 15:23:34 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 17 Oct 2008 08:23:34 -0700 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; Fri, 17 Oct 2008 15:22:35 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id B269E23888A6; Fri, 17 Oct 2008 08:23:12 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r705642 - /activemq/trunk/activemq-core/src/test/java/org/apache/activemq/network/DuplexNetworkMBeanTest.java Date: Fri, 17 Oct 2008 15:23:12 -0000 To: commits@activemq.apache.org From: gtully@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20081017152312.B269E23888A6@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: gtully Date: Fri Oct 17 08:23:11 2008 New Revision: 705642 URL: http://svn.apache.org/viewvc?rev=705642&view=rev Log: ensure test won't hang if mbean server never comes alive, just in case Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/network/DuplexNetworkMBeanTest.java Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/network/DuplexNetworkMBeanTest.java URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/network/DuplexNetworkMBeanTest.java?rev=705642&r1=705641&r2=705642&view=diff ============================================================================== --- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/network/DuplexNetworkMBeanTest.java (original) +++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/network/DuplexNetworkMBeanTest.java Fri Oct 17 08:23:11 2008 @@ -124,7 +124,7 @@ if (mbsc != null) { mbeans = mbsc.queryMBeans(beanName, null); } - } while (mbeans == null || mbeans.isEmpty() && expiryTime > System.currentTimeMillis()); + } while ((mbeans == null || mbeans.isEmpty()) && expiryTime > System.currentTimeMillis()); return mbeans.size(); }