Return-Path: Delivered-To: apmail-geronimo-activemq-commits-archive@www.apache.org Received: (qmail 4150 invoked from network); 9 Aug 2006 07:18:22 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 9 Aug 2006 07:18:22 -0000 Received: (qmail 91407 invoked by uid 500); 9 Aug 2006 07:18:22 -0000 Delivered-To: apmail-geronimo-activemq-commits-archive@geronimo.apache.org Received: (qmail 91387 invoked by uid 500); 9 Aug 2006 07:18:22 -0000 Mailing-List: contact activemq-commits-help@geronimo.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: activemq-dev@geronimo.apache.org Delivered-To: mailing list activemq-commits@geronimo.apache.org Received: (qmail 91378 invoked by uid 99); 9 Aug 2006 07:18:22 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 09 Aug 2006 00:18:22 -0700 X-ASF-Spam-Status: No, hits=-8.6 required=10.0 tests=ALL_TRUSTED,INFO_TLD,NO_REAL_NAME X-Spam-Check-By: apache.org Received-SPF: pass (asf.osuosl.org: local policy) Received: from [140.211.166.113] (HELO eris.apache.org) (140.211.166.113) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 09 Aug 2006 00:18:21 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 533421A981A; Wed, 9 Aug 2006 00:18:01 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r429984 - /incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/TransportConnector.java Date: Wed, 09 Aug 2006 07:18:00 -0000 To: activemq-commits@geronimo.apache.org From: rajdavies@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20060809071801.533421A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: rajdavies Date: Wed Aug 9 00:17:59 2006 New Revision: 429984 URL: http://svn.apache.org/viewvc?rev=429984&view=rev Log: fix for http://issues.apache.org/activemq/browse/AMQ-872 Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/TransportConnector.java Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/TransportConnector.java URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/TransportConnector.java?rev=429984&r1=429983&r2=429984&view=diff ============================================================================== --- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/TransportConnector.java (original) +++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/TransportConnector.java Wed Aug 9 00:17:59 2006 @@ -66,6 +66,7 @@ private URI connectUri; private String name; private boolean disableAsyncDispatch=false; + private boolean enableStatusMonitor = true; /** @@ -75,14 +76,21 @@ return connections; } - public TransportConnector() { - this.statusDector = new TransportStatusDetector(this); + public TransportConnector(){ } + - public TransportConnector(Broker broker, TransportServer server) { + public TransportConnector(Broker broker,TransportServer server){ this(); setBroker(broker); setServer(server); + if (server!=null&&server.getConnectURI()!=null){ + URI uri = server.getConnectURI(); + if (uri != null && uri.getScheme().equals("vm")){ + setEnableStatusMonitor(false); + } + } + } /** @@ -207,7 +215,11 @@ da.registerService(getConnectUri().toString()); da.start(); } - this.statusDector.start(); + if (enableStatusMonitor){ + this.statusDector = new TransportStatusDetector(this); + this.statusDector.start(); + } + log.info("Connector "+getName()+" Started"); } @@ -219,7 +231,10 @@ if (server != null) { ss.stop(server); } - this.statusDector.stop(); + if (this.statusDector != null){ + this.statusDector.stop(); + } + for (Iterator iter = connections.iterator(); iter.hasNext();) { TransportConnection c = (TransportConnection) iter.next(); ss.stop(c); @@ -314,4 +329,18 @@ public void setDisableAsyncDispatch(boolean disableAsyncDispatch) { this.disableAsyncDispatch = disableAsyncDispatch; } + + /** + * @return the enableStatusMonitor + */ + public boolean isEnableStatusMonitor(){ + return enableStatusMonitor; + } + + /** + * @param enableStatusMonitor the enableStatusMonitor to set + */ + public void setEnableStatusMonitor(boolean enableStatusMonitor){ + this.enableStatusMonitor=enableStatusMonitor; + } }