Author: clebert.suconic(a)jboss.com Date: 2011-09-11 22:25:45 -0400 (Sun, 11 Sep 2011) New Revision: 11318 Modified: branches/Branch_2_2_EAP/src/main/org/hornetq/core/server/cluster/impl/BridgeImpl.java Log: Trying to fix a test Modified: branches/Branch_2_2_EAP/src/main/org/hornetq/core/server/cluster/impl/BridgeImpl.java =================================================================== --- branches/Branch_2_2_EAP/src/main/org/hornetq/core/server/cluster/impl/BridgeImpl.java 2011-09-12 01:47:54 UTC (rev 11317) +++ branches/Branch_2_2_EAP/src/main/org/hornetq/core/server/cluster/impl/BridgeImpl.java 2011-09-12 02:25:45 UTC (rev 11318) @@ -863,10 +863,6 @@ { log.debug("stopping bridge " + BridgeImpl.this); - queue.removeConsumer(BridgeImpl.this); - - internalCancelReferences(); - if (session != null) { log.debug("Cleaning up session " + session); @@ -886,6 +882,10 @@ csf.cleanup(); } + queue.removeConsumer(BridgeImpl.this); + + internalCancelReferences(); + synchronized (BridgeImpl.this) { log.debug("Closing Session for bridge " + BridgeImpl.this.name);