From 2b903d446ad57e0ab84cee7556a9a68542d72d29 Mon Sep 17 00:00:00 2001
From: "Adrian T. Co" <aco@apache.org>
Date: Thu, 21 Dec 2006 17:17:19 +0000
Subject: [PATCH] Fix for AMQ-1106: PooledBrokerFactoryBean incorrectly
 compares broker config resources

git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@489413 13f79535-47bb-0310-9956-ffa450edef68
---
 .../apache/activemq/xbean/PooledBrokerFactoryBean.java | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/activemq-core/src/main/java/org/apache/activemq/xbean/PooledBrokerFactoryBean.java b/activemq-core/src/main/java/org/apache/activemq/xbean/PooledBrokerFactoryBean.java
index f5eadd0673..c3dbd9e92e 100644
--- a/activemq-core/src/main/java/org/apache/activemq/xbean/PooledBrokerFactoryBean.java
+++ b/activemq-core/src/main/java/org/apache/activemq/xbean/PooledBrokerFactoryBean.java
@@ -47,14 +47,14 @@ public class PooledBrokerFactoryBean implements FactoryBean, InitializingBean, D
     
     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 class PooledBrokerFactoryBean implements FactoryBean, InitializingBean, D
 
     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 class PooledBrokerFactoryBean implements FactoryBean, InitializingBean, D
 
     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();
             }