From a9ccf5623d547389c2864baa4ef2505d7ada3b84 Mon Sep 17 00:00:00 2001
From: Robert Davies <rajdavies@apache.org>
Date: Wed, 12 Mar 2008 11:16:05 +0000
Subject: [PATCH] check for null message in MessageDispatch

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@636281 13f79535-47bb-0310-9956-ffa450edef68
---
 .../apache/activemq/network/DemandForwardingBridgeSupport.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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);