svn commit: r497949 - in /incubator/qpid/branches/qpid.0-9/java/broker/src/main/java/org/apache/qpid/server: exchange/DefaultExchangeRegistry.java handler/MessageTransferHandler.java

[rhs]

Author: rhs
Date: Fri Jan 19 12:41:14 2007
New Revision: 497949

URL: http://svn.apache.org/viewvc?view=rev&rev=497949
Log:
route on destination rather than exchange

Modified:
    
incubator/qpid/branches/qpid.0-9/java/broker/src/main/java/org/apache/qpid/server/exchange/DefaultExchangeRegistry.java
    
incubator/qpid/branches/qpid.0-9/java/broker/src/main/java/org/apache/qpid/server/handler/MessageTransferHandler.java

Modified: 
incubator/qpid/branches/qpid.0-9/java/broker/src/main/java/org/apache/qpid/server/exchange/DefaultExchangeRegistry.java
URL: 
http://svn.apache.org/viewvc/incubator/qpid/branches/qpid.0-9/java/broker/src/main/java/org/apache/qpid/server/exchange/DefaultExchangeRegistry.java?view=diff&rev=497949&r1=497948&r2=497949
==============================================================================
--- 
incubator/qpid/branches/qpid.0-9/java/broker/src/main/java/org/apache/qpid/server/exchange/DefaultExchangeRegistry.java
 (original)
+++ 
incubator/qpid/branches/qpid.0-9/java/broker/src/main/java/org/apache/qpid/server/exchange/DefaultExchangeRegistry.java
 Fri Jan 19 12:41:14 2007
@@ -81,7 +81,7 @@
      */
     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

Modified: 
incubator/qpid/branches/qpid.0-9/java/broker/src/main/java/org/apache/qpid/server/handler/MessageTransferHandler.java
URL: 
http://svn.apache.org/viewvc/incubator/qpid/branches/qpid.0-9/java/broker/src/main/java/org/apache/qpid/server/handler/MessageTransferHandler.java?view=diff&rev=497949&r1=497948&r2=497949
==============================================================================
--- 
incubator/qpid/branches/qpid.0-9/java/broker/src/main/java/org/apache/qpid/server/handler/MessageTransferHandler.java
 (original)
+++ 
incubator/qpid/branches/qpid.0-9/java/broker/src/main/java/org/apache/qpid/server/handler/MessageTransferHandler.java
 Fri Jan 19 12:41:14 2007
@@ -65,10 +65,10 @@
         }
 
         // 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());