From 226be67c91b25a5ba8efdd9ba88566033ec97718 Mon Sep 17 00:00:00 2001
From: "Rafael H. Schloming" <rhs@apache.org>
Date: Fri, 19 Jan 2007 20:41:14 +0000
Subject: route on destination rather than exchange

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/qpid.0-9@497949 13f79535-47bb-0310-9956-ffa450edef68
---
 .../org/apache/qpid/server/exchange/DefaultExchangeRegistry.java    | 2 +-
 .../java/org/apache/qpid/server/handler/MessageTransferHandler.java | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'java')

diff --git a/java/broker/src/main/java/org/apache/qpid/server/exchange/DefaultExchangeRegistry.java b/java/broker/src/main/java/org/apache/qpid/server/exchange/DefaultExchangeRegistry.java
index 5c484edfef..ef94918e59 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/exchange/DefaultExchangeRegistry.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/exchange/DefaultExchangeRegistry.java
@@ -81,7 +81,7 @@ public class DefaultExchangeRegistry implements ExchangeRegistry
      */
     public void routeContent(AMQMessage payload) throws AMQException
     {
-        final String exchange = payload.getTransferBody().exchange;
+        final String exchange = payload.getTransferBody().destination;
         final Exchange exch = _exchangeMap.get(exchange);
         // there is a small window of opportunity for the exchange to be deleted in between
         // the JmsPublish being received (where the exchange is validated) and the final
diff --git a/java/broker/src/main/java/org/apache/qpid/server/handler/MessageTransferHandler.java b/java/broker/src/main/java/org/apache/qpid/server/handler/MessageTransferHandler.java
index 32b34c74a3..7cee8cb1e0 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/handler/MessageTransferHandler.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/handler/MessageTransferHandler.java
@@ -65,10 +65,10 @@ public class MessageTransferHandler implements StateAwareMethodListener<MessageT
         }
 
         // TODO: check the delivery tag field details - is it unique across the broker or per subscriber?
-        if (body.exchange == null) {
-            body.exchange = ExchangeDefaults.DIRECT_EXCHANGE_NAME;
+        if (body.destination == null) {
+            body.destination = ExchangeDefaults.DIRECT_EXCHANGE_NAME;
         }
-        Exchange e = exchangeRegistry.getExchange(body.exchange);
+        Exchange e = exchangeRegistry.getExchange(body.destination);
         // if the exchange does not exist we raise a channel exception
         if (e == null) {
             protocolSession.closeChannel(evt.getChannelId());
-- 
cgit v1.2.1