Return-Path: X-Original-To: apmail-activemq-commits-archive@www.apache.org Delivered-To: apmail-activemq-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 1B297114C2 for ; Mon, 18 Aug 2014 22:06:48 +0000 (UTC) Received: (qmail 7073 invoked by uid 500); 18 Aug 2014 22:06:48 -0000 Delivered-To: apmail-activemq-commits-archive@activemq.apache.org Received: (qmail 7031 invoked by uid 500); 18 Aug 2014 22:06:48 -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 7021 invoked by uid 99); 18 Aug 2014 22:06:48 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 18 Aug 2014 22:06:48 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id B35D49C6781; Mon, 18 Aug 2014 22:06:47 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: tabish@apache.org To: commits@activemq.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: git commit: This test does not need a management context, disable JMX Date: Mon, 18 Aug 2014 22:06:47 +0000 (UTC) Repository: activemq Updated Branches: refs/heads/trunk 9b017fdb3 -> aae7aeaf3 This test does not need a management context, disable JMX Project: http://git-wip-us.apache.org/repos/asf/activemq/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/aae7aeaf Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/aae7aeaf Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/aae7aeaf Branch: refs/heads/trunk Commit: aae7aeaf39e028afb5097a25a2caffbfd98b1b99 Parents: 9b017fd Author: Timothy Bish Authored: Mon Aug 18 18:06:42 2014 -0400 Committer: Timothy Bish Committed: Mon Aug 18 18:06:42 2014 -0400 ---------------------------------------------------------------------- .../org/apache/activemq/bugs/AMQ4368Test.java | 25 +++++++++++++------- 1 file changed, 17 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq/blob/aae7aeaf/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4368Test.java ---------------------------------------------------------------------- diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4368Test.java b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4368Test.java index 09e5607..4978a9f 100644 --- a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4368Test.java +++ b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4368Test.java @@ -16,6 +16,21 @@ */ package org.apache.activemq.bugs; +import static org.junit.Assert.assertTrue; + +import java.util.concurrent.CountDownLatch; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.atomic.AtomicBoolean; +import java.util.concurrent.atomic.AtomicLong; + +import javax.jms.Connection; +import javax.jms.Destination; +import javax.jms.JMSException; +import javax.jms.Message; +import javax.jms.MessageConsumer; +import javax.jms.MessageProducer; +import javax.jms.Session; + import org.apache.activemq.ActiveMQConnectionFactory; import org.apache.activemq.broker.BrokerService; import org.apache.activemq.broker.region.policy.PolicyEntry; @@ -28,14 +43,6 @@ import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.jms.*; -import java.util.concurrent.CountDownLatch; -import java.util.concurrent.TimeUnit; -import java.util.concurrent.atomic.AtomicBoolean; -import java.util.concurrent.atomic.AtomicLong; - -import static org.junit.Assert.assertTrue; - public class AMQ4368Test { private static final Logger LOG = LoggerFactory.getLogger(AMQ4368Test.class); @@ -74,6 +81,8 @@ public class AMQ4368Test { kahadb.deleteAllMessages(); broker.setPersistenceAdapter(kahadb); broker.getSystemUsage().getMemoryUsage().setLimit(1024*1024*100); + broker.setUseJmx(false); + return broker; }