/**
 * 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.qpid.jms.message;

import org.apache.qpid.jms.meta.JmsConsumerId;

/**
 * Envelope used to deliver incoming messages to their targeted consumer.
 */
public class JmsInboundMessageDispatch {

    private JmsConsumerId consumerId;
    private JmsMessage message;
    private Object providerHint;

    public JmsMessage getMessage() {
        return message;
    }

    public void setMessage(JmsMessage message) {
        this.message = message;
    }

    public JmsConsumerId getConsumerId() {
        return consumerId;
    }

    public void setConsumerId(JmsConsumerId consumerId) {
        this.consumerId = consumerId;
    }

    public Object getProviderHint() {
        return this.providerHint;
    }

    public void setProviderHint(Object hint) {
        this.providerHint = hint;
    }

    public void onMessageRedelivered() {
        this.message.incrementRedeliveryCount();
    }
}

@@ -835,16 +835,71 @@
 ssage;%0A%0A
+import org.apache.qpid.jms.meta.JmsAbstractResourceId;%0A
 import o
@@ -937,16 +937,16 @@
 umerId;%0A
-
 %0A/**%0A * 
@@ -1059,16 +1059,45 @@
 ispatch 
+extends JmsAbstractResourceId
 %7B%0A%0A    p
@@ -1164,41 +1164,8 @@
 age;
-%0A    private Object providerHint;
 %0A%0A  
@@ -1449,24 +1449,24 @@
 nsumerId) %7B%0A
+
         this
@@ -1502,175 +1502,8 @@
  %7D%0A%0A
-    public Object getProviderHint() %7B%0A        return this.providerHint;%0A    %7D%0A%0A    public void setProviderHint(Object hint) %7B%0A        this.providerHint = hint;%0A    %7D%0A%0A
     

make the inbound messsage envelope part of the Id heirachy