Author: borges Date: 2011-11-08 10:18:23 -0500 (Tue, 08 Nov 2011) New Revision: 11670 Modified: trunk/hornetq-core/src/main/java/org/hornetq/core/server/cluster/impl/ClusterManagerImpl.java Log: Fix NPE on non-existent bridge Modified: trunk/hornetq-core/src/main/java/org/hornetq/core/server/cluster/impl/ClusterManagerImpl.java =================================================================== --- trunk/hornetq-core/src/main/java/org/hornetq/core/server/cluster/impl/ClusterManagerImpl.java 2011-11-08 15:18:07 UTC (rev 11669) +++ trunk/hornetq-core/src/main/java/org/hornetq/core/server/cluster/impl/ClusterManagerImpl.java 2011-11-08 15:18:23 UTC (rev 11670) @@ -548,8 +548,8 @@ managementService.unregisterBridge(name); } } - - bridge.flushExecutor(); + if (bridge != null) + bridge.flushExecutor(); } // for testing