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 247A563BF for ; Fri, 29 Jul 2011 12:58:42 +0000 (UTC) Received: (qmail 4502 invoked by uid 500); 29 Jul 2011 12:58:42 -0000 Delivered-To: apmail-activemq-commits-archive@activemq.apache.org Received: (qmail 4436 invoked by uid 500); 29 Jul 2011 12:58:41 -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 4429 invoked by uid 99); 29 Jul 2011 12:58:40 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 29 Jul 2011 12:58:40 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.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, 29 Jul 2011 12:58:39 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id BAFF023888CD for ; Fri, 29 Jul 2011 12:58:19 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1152194 - /activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/AbstractRegion.java Date: Fri, 29 Jul 2011 12:58:19 -0000 To: commits@activemq.apache.org From: tabish@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110729125819.BAFF023888CD@eris.apache.org> Author: tabish Date: Fri Jul 29 12:58:18 2011 New Revision: 1152194 URL: http://svn.apache.org/viewvc?rev=1152194&view=rev Log: fix for: https://issues.apache.org/jira/browse/AMQ-3426 Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/AbstractRegion.java Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/AbstractRegion.java URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/AbstractRegion.java?rev=1152194&r1=1152193&r2=1152194&view=diff ============================================================================== --- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/AbstractRegion.java (original) +++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/AbstractRegion.java Fri Jul 29 12:58:18 2011 @@ -50,7 +50,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * + * */ public abstract class AbstractRegion implements Region { @@ -78,7 +78,7 @@ public abstract class AbstractRegion imp this.destinationStatistics = destinationStatistics; this.usageManager = memoryManager; this.taskRunnerFactory = taskRunnerFactory; - if (broker == null) { + if (destinationFactory == null) { throw new IllegalArgumentException("null destinationFactory"); } this.destinationFactory = destinationFactory; @@ -223,7 +223,7 @@ public abstract class AbstractRegion imp /** * Provide an exact or wildcard lookup of destinations in the region - * + * * @return a set of matching destination objects. */ public Set getDestinations(ActiveMQDestination destination) { @@ -314,7 +314,7 @@ public abstract class AbstractRegion imp /** * Get all the Destinations that are in storage - * + * * @return Set of all stored destinations */ public Set getDurableDestinations() { @@ -506,7 +506,7 @@ public abstract class AbstractRegion imp /** * Removes a Producer. - * + * * @param context * the environment the operation is being executed under. * @throws Exception