diff --git a/activemq-core/src/main/java/org/apache/activemq/network/DemandForwardingBridgeSupport.java b/activemq-core/src/main/java/org/apache/activemq/network/DemandForwardingBridgeSupport.java index 3a2896ebf4..bf7327ab50 100644 --- a/activemq-core/src/main/java/org/apache/activemq/network/DemandForwardingBridgeSupport.java +++ b/activemq-core/src/main/java/org/apache/activemq/network/DemandForwardingBridgeSupport.java @@ -564,7 +564,7 @@ public abstract class DemandForwardingBridgeSupport implements NetworkBridge { //localStartedLatch.await(); final MessageDispatch md = (MessageDispatch)command; DemandSubscription sub = subscriptionMapByLocalId.get(md.getConsumerId()); - if (sub != null) { + if (sub != null && md.getMessage()!=null) { Message message = configureMessage(md); if (trace) { LOG.trace("bridging " + configuration.getBrokerName() + " -> " + remoteBrokerName + ": " + message);