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 50731E13F for ; Tue, 29 Jan 2013 20:47:10 +0000 (UTC) Received: (qmail 54414 invoked by uid 500); 29 Jan 2013 20:47:10 -0000 Delivered-To: apmail-activemq-commits-archive@activemq.apache.org Received: (qmail 54387 invoked by uid 500); 29 Jan 2013 20:47:10 -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 54380 invoked by uid 99); 29 Jan 2013 20:47:10 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 29 Jan 2013 20:47:10 +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; Tue, 29 Jan 2013 20:47:08 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 01EA5238896F; Tue, 29 Jan 2013 20:46:50 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1440116 - /activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/network/DemandForwardingBridgeSupport.java Date: Tue, 29 Jan 2013 20:46:49 -0000 To: commits@activemq.apache.org From: tabish@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130129204650.01EA5238896F@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: tabish Date: Tue Jan 29 20:46:49 2013 New Revision: 1440116 URL: http://svn.apache.org/viewvc?rev=1440116&view=rev Log: remove unused imports and add override annotations. Fix some spelling in the comments. Modified: activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/network/DemandForwardingBridgeSupport.java Modified: activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/network/DemandForwardingBridgeSupport.java URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/network/DemandForwardingBridgeSupport.java?rev=1440116&r1=1440115&r2=1440116&view=diff ============================================================================== --- activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/network/DemandForwardingBridgeSupport.java (original) +++ activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/network/DemandForwardingBridgeSupport.java Tue Jan 29 20:46:49 2013 @@ -33,12 +33,12 @@ import java.util.concurrent.atomic.Atomi import javax.management.ObjectName; +import org.apache.activemq.DestinationDoesNotExistException; import org.apache.activemq.Service; import org.apache.activemq.advisory.AdvisoryBroker; import org.apache.activemq.advisory.AdvisorySupport; import org.apache.activemq.broker.BrokerService; import org.apache.activemq.broker.BrokerServiceAware; -import org.apache.activemq.DestinationDoesNotExistException; import org.apache.activemq.broker.ConnectionContext; import org.apache.activemq.broker.TransportConnection; import org.apache.activemq.broker.region.AbstractRegion; @@ -81,7 +81,6 @@ import org.apache.activemq.transport.Fut import org.apache.activemq.transport.ResponseCallback; import org.apache.activemq.transport.Transport; import org.apache.activemq.transport.TransportDisposedIOException; -import org.apache.activemq.transport.TransportFactory; import org.apache.activemq.transport.TransportFilter; import org.apache.activemq.transport.tcp.SslTransport; import org.apache.activemq.util.IdGenerator; @@ -702,7 +701,7 @@ public abstract class DemandForwardingBr LOG.trace(configuration.getBrokerName() + " bridging " + (destInfo.isAddOperation() ? "add" : "remove") + " destination on " + localBroker + " from " + remoteBrokerName + ", destination: " + destInfo); } if (destInfo.isRemoveOperation()) { - // serialise with removeSub operations such that all removeSub advisories are generated + // Serialize with removeSub operations such that all removeSub advisories are generated serialExecutor.execute(new Runnable() { @Override public void run() { @@ -809,7 +808,7 @@ public abstract class DemandForwardingBr subscriptionMapByRemoteId.remove(sub.getRemoteInfo().getConsumerId()); // continue removal in separate thread to free up this thread for outstanding responses - // serialise with removeDestination operations so that removeSubs are serialised with removeDestinations + // Serialize with removeDestination operations so that removeSubs are serialised with removeDestinations // such that all removeSub advisories are generated serialExecutor.execute(new Runnable() { @Override