From 1195ae751c69dd8bd4a5e797c6300ccd97fe6ee6 Mon Sep 17 00:00:00 2001
From: Robert Davies <rajdavies@apache.org>
Date: Mon, 3 Sep 2007 12:50:17 +0000
Subject: [PATCH] ensure the ConectionContext always has a broker set before
 sending message to DLQ

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@572300 13f79535-47bb-0310-9956-ffa450edef68
---
 .../java/org/apache/activemq/broker/region/RegionBroker.java   | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/region/RegionBroker.java b/activemq-core/src/main/java/org/apache/activemq/broker/region/RegionBroker.java
index c13cada724..443d164bb6 100755
--- a/activemq-core/src/main/java/org/apache/activemq/broker/region/RegionBroker.java
+++ b/activemq-core/src/main/java/org/apache/activemq/broker/region/RegionBroker.java
@@ -664,6 +664,9 @@ public class RegionBroker implements Broker {
 							ActiveMQDestination deadLetterDestination=deadLetterStrategy
 							        .getDeadLetterQueueFor(message
 							                .getDestination());
+							if (context.getBroker()==null) {
+								context.setBroker(getRoot());
+							}
 							BrokerSupport.resend(context,message,
 							        deadLetterDestination);
 							sent=true;