/**
 * Licensed to the Apache Software Foundation (ASF) under one or more
 * contributor license agreements.  See the NOTICE file distributed with
 * this work for additional information regarding copyright ownership.
 * The ASF licenses this file to You under the Apache License, Version 2.0
 * (the "License"); you may not use this file except in compliance with
 * the License.  You may obtain a copy of the License at
 *
 *      http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
package org.apache.activemq.util;

import org.apache.activemq.broker.ConnectionContext;
import org.apache.activemq.broker.ProducerBrokerExchange;
import org.apache.activemq.command.ActiveMQDestination;
import org.apache.activemq.command.Message;
import org.apache.activemq.command.ProducerInfo;
import org.apache.activemq.state.ProducerState;

public final class BrokerSupport {

    private BrokerSupport() {        
    }
    
    /**
     * @param context
     * @param message
     * @param deadLetterDestination
     * @throws Exception
     */
    public static void resend(final ConnectionContext context, Message message, ActiveMQDestination deadLetterDestination) throws Exception {
        if (message.getOriginalDestination() != null) {
            message.setOriginalDestination(message.getDestination());
        }
        if (message.getOriginalTransactionId() != null) {
            message.setOriginalTransactionId(message.getTransactionId());
        }
        message.setDestination(deadLetterDestination);
        message.setTransactionId(null);
        boolean originalFlowControl = context.isProducerFlowControl();
        try {
            context.setProducerFlowControl(false);
            ProducerInfo info = new ProducerInfo();
            ProducerState state = new ProducerState(info);
            ProducerBrokerExchange producerExchange = new ProducerBrokerExchange();
            producerExchange.setProducerState(state);
            producerExchange.setMutable(true);
            producerExchange.setConnectionContext(context);
            context.getBroker().send(producerExchange, message);
        } finally {
            context.setProducerFlowControl(originalFlowControl);
        }
    }

}

@@ -1141,16 +1141,68 @@
 State;%0A%0A
+/**%0A * Utility class for re-sending messages%0A *%0A */%0A
 public f
@@ -1322,23 +1322,32 @@
  @param 
-m
+originalM
 essage
+ 
 %0A     * 
@@ -1479,17 +1479,25 @@
 Message 
-m
+originalM
 essage, 
@@ -1570,60 +1570,50 @@
     
-if (
+Message 
 message
-.getO
+ = o
 riginal
-Destination() != null) %7B%0A    
+Message.copy();%0A
     
@@ -1678,80 +1678,8 @@
 ));%0A
-        %7D%0A        if (message.getOriginalTransactionId() != null) %7B%0A    
     
@@ -1744,26 +1744,16 @@
 nId());%0A
-        %7D%0A
         

copy message before resend