Return-Path: Delivered-To: apmail-geronimo-activemq-commits-archive@www.apache.org Received: (qmail 66384 invoked from network); 21 Dec 2006 17:12:58 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 21 Dec 2006 17:12:58 -0000 Received: (qmail 59532 invoked by uid 500); 21 Dec 2006 17:13:05 -0000 Delivered-To: apmail-geronimo-activemq-commits-archive@geronimo.apache.org Received: (qmail 59481 invoked by uid 500); 21 Dec 2006 17:13:05 -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 59472 invoked by uid 99); 21 Dec 2006 17:13:05 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 21 Dec 2006 09:13:05 -0800 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 21 Dec 2006 09:12:57 -0800 Received: by eris.apache.org (Postfix, from userid 65534) id 368F61A981A; Thu, 21 Dec 2006 09:12:08 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r489409 - /incubator/activemq/branches/activemq-4.1/activemq-core/src/main/java/org/apache/activemq/xbean/PooledBrokerFactoryBean.java Date: Thu, 21 Dec 2006 17:12:08 -0000 To: activemq-commits@geronimo.apache.org From: aco@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20061221171208.368F61A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: aco Date: Thu Dec 21 09:12:07 2006 New Revision: 489409 URL: http://svn.apache.org/viewvc?view=rev&rev=489409 Log: Fix for AMQ-1106: PooledBrokerFactoryBean incorrectly compares broker config resources Modified: incubator/activemq/branches/activemq-4.1/activemq-core/src/main/java/org/apache/activemq/xbean/PooledBrokerFactoryBean.java Modified: incubator/activemq/branches/activemq-4.1/activemq-core/src/main/java/org/apache/activemq/xbean/PooledBrokerFactoryBean.java URL: http://svn.apache.org/viewvc/incubator/activemq/branches/activemq-4.1/activemq-core/src/main/java/org/apache/activemq/xbean/PooledBrokerFactoryBean.java?view=diff&rev=489409&r1=489408&r2=489409 ============================================================================== --- incubator/activemq/branches/activemq-4.1/activemq-core/src/main/java/org/apache/activemq/xbean/PooledBrokerFactoryBean.java (original) +++ incubator/activemq/branches/activemq-4.1/activemq-core/src/main/java/org/apache/activemq/xbean/PooledBrokerFactoryBean.java Thu Dec 21 09:12:07 2006 @@ -47,14 +47,14 @@ public void afterPropertiesSet() throws Exception { synchronized( sharedBrokerMap ) { - SharedBroker sharedBroker = (SharedBroker) sharedBrokerMap.get(config); + SharedBroker sharedBroker = (SharedBroker) sharedBrokerMap.get(config.getFilename()); if( sharedBroker == null ) { sharedBroker = new SharedBroker(); sharedBroker.factory = new BrokerFactoryBean(); sharedBroker.factory.setConfig(config); sharedBroker.factory.setStart(start); sharedBroker.factory.afterPropertiesSet(); - sharedBrokerMap.put(config, sharedBroker); + sharedBrokerMap.put(config.getFilename(), sharedBroker); } sharedBroker.refCount++; } @@ -62,12 +62,12 @@ public void destroy() throws Exception { synchronized( sharedBrokerMap ) { - SharedBroker sharedBroker = (SharedBroker) sharedBrokerMap.get(config); + SharedBroker sharedBroker = (SharedBroker) sharedBrokerMap.get(config.getFilename()); if( sharedBroker != null ) { sharedBroker.refCount--; if( sharedBroker.refCount==0 ) { sharedBroker.factory.destroy(); - sharedBrokerMap.remove(config); + sharedBrokerMap.remove(config.getFilename()); } } } @@ -79,7 +79,7 @@ public Object getObject() throws Exception { synchronized( sharedBrokerMap ) { - SharedBroker sharedBroker = (SharedBroker) sharedBrokerMap.get(config); + SharedBroker sharedBroker = (SharedBroker) sharedBrokerMap.get(config.getFilename()); if( sharedBroker != null ) { return sharedBroker.factory.getObject(); }