Author: robbie
Date: Tue Jan 8 15:31:09 2013
New Revision: 1430321
URL: http://svn.apache.org/viewvc?rev=1430321&view=rev
Log:
QPID-4521: ensure that the routing key is properly passed to the alternate
Topic exchange by the adapter. Add unit tests for the adapter methods.
merged from trunk r1425515
Added:
qpid/branches/0.20/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/InboundMessageAdapterTest.java
- copied unchanged from r1425515,
qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/InboundMessageAdapterTest.java
Modified:
qpid/branches/0.20/qpid/java/ (props changed)
qpid/branches/0.20/qpid/java/broker/ (props changed)
qpid/branches/0.20/qpid/java/broker/src/ (props changed)
qpid/branches/0.20/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/
(props changed)
qpid/branches/0.20/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/InboundMessageAdapter.java
Propchange: qpid/branches/0.20/qpid/java/
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java:r1425515
Propchange: qpid/branches/0.20/qpid/java/broker/
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/broker:r1425515
Propchange: qpid/branches/0.20/qpid/java/broker/src/
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/broker/src:r1425515
Propchange:
qpid/branches/0.20/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/
------------------------------------------------------------------------------
Merged
/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/queue:r1425515
Modified:
qpid/branches/0.20/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/InboundMessageAdapter.java
URL:
http://svn.apache.org/viewvc/qpid/branches/0.20/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/InboundMessageAdapter.java?rev=1430321&r1=1430320&r2=1430321&view=diff
==============================================================================
---
qpid/branches/0.20/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/InboundMessageAdapter.java
(original)
+++
qpid/branches/0.20/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/InboundMessageAdapter.java
Tue Jan 8 15:31:09 2013
@@ -47,7 +47,7 @@ public class InboundMessageAdapter imple
public AMQShortString getRoutingKeyShortString()
{
- return AMQShortString.valueOf(_entry.getMessage());
+ return AMQShortString.valueOf(_entry.getMessage().getRoutingKey());
}
public String getRoutingKey()
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
