From commits-return-12890-apmail-activemq-commits-archive=activemq.apache.org@activemq.apache.org Tue Jan 26 18:01:03 2010 Return-Path: Delivered-To: apmail-activemq-commits-archive@www.apache.org Received: (qmail 78031 invoked from network); 26 Jan 2010 18:01:02 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 26 Jan 2010 18:01:02 -0000 Received: (qmail 91925 invoked by uid 500); 26 Jan 2010 18:01:02 -0000 Delivered-To: apmail-activemq-commits-archive@activemq.apache.org Received: (qmail 91866 invoked by uid 500); 26 Jan 2010 18:01:02 -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 91857 invoked by uid 99); 26 Jan 2010 18:01:02 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 26 Jan 2010 18:01:02 +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; Tue, 26 Jan 2010 18:01:01 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 4031323889E2; Tue, 26 Jan 2010 18:00:41 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r903344 - /activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/AMQ2102Test.java Date: Tue, 26 Jan 2010 18:00:41 -0000 To: commits@activemq.apache.org From: gtully@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100126180041.4031323889E2@eris.apache.org> Author: gtully Date: Tue Jan 26 18:00:40 2010 New Revision: 903344 URL: http://svn.apache.org/viewvc?rev=903344&view=rev Log: dsiable shutdown hook as it causes autofail exit to hang which defeats the purpos - want a stack trace if it hangs again Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/AMQ2102Test.java Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/AMQ2102Test.java URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/AMQ2102Test.java?rev=903344&r1=903343&r2=903344&view=diff ============================================================================== --- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/AMQ2102Test.java (original) +++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/AMQ2102Test.java Tue Jan 26 18:00:40 2010 @@ -444,9 +444,10 @@ String masterUrl; public void setUp() throws Exception { - setMaxTestTime(6 * 60 * 1000); + setMaxTestTime(12 * 60 * 1000); setAutoFail(true); super.setUp(); + master.setUseShutdownHook(false); master.setBrokerName("Master"); master.addConnector("tcp://localhost:0"); master.deleteAllMessages(); @@ -467,6 +468,7 @@ masterUrl = master.getTransportConnectors().get(0).getConnectUri().toString(); debug("masterUrl: " + masterUrl); + slave.setUseShutdownHook(false); slave.setBrokerName("Slave"); slave.deleteAllMessages(); slave.addConnector("tcp://localhost:0");