summaryrefslogtreecommitdiff
path: root/qpid/java/client/src/main
diff options
context:
space:
mode:
authorAidan Skinner <aidan@apache.org>2009-02-11 15:55:48 +0000
committerAidan Skinner <aidan@apache.org>2009-02-11 15:55:48 +0000
commitd7250faaae1b8692b7654cc848a2080b14796dbe (patch)
tree1f2b496f799325b8ba7db867a8d61bf414675b8f /qpid/java/client/src/main
parent45096aedbcef046740a7eb8e139f3a287c0e8e8b (diff)
downloadqpid-python-d7250faaae1b8692b7654cc848a2080b14796dbe.tar.gz
QPID-1623: Allow null as a valid destination for JMSReplyTo
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@743367 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/client/src/main')
-rw-r--r--qpid/java/client/src/main/java/org/apache/qpid/client/message/AMQMessageDelegate_0_10.java3
-rw-r--r--qpid/java/client/src/main/java/org/apache/qpid/client/message/AMQMessageDelegate_0_8.java3
2 files changed, 4 insertions, 2 deletions
diff --git a/qpid/java/client/src/main/java/org/apache/qpid/client/message/AMQMessageDelegate_0_10.java b/qpid/java/client/src/main/java/org/apache/qpid/client/message/AMQMessageDelegate_0_10.java
index d064c27754..338aefbd4a 100644
--- a/qpid/java/client/src/main/java/org/apache/qpid/client/message/AMQMessageDelegate_0_10.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/message/AMQMessageDelegate_0_10.java
@@ -286,7 +286,8 @@ public class AMQMessageDelegate_0_10 implements AMQMessageDelegate
{
if (destination == null)
{
- throw new IllegalArgumentException("Null destination not allowed");
+ _messageProps.setReplyTo(null);
+ return;
}
if (!(destination instanceof AMQDestination))
diff --git a/qpid/java/client/src/main/java/org/apache/qpid/client/message/AMQMessageDelegate_0_8.java b/qpid/java/client/src/main/java/org/apache/qpid/client/message/AMQMessageDelegate_0_8.java
index 4c20a44849..d053b8af80 100644
--- a/qpid/java/client/src/main/java/org/apache/qpid/client/message/AMQMessageDelegate_0_8.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/message/AMQMessageDelegate_0_8.java
@@ -196,7 +196,8 @@ public class AMQMessageDelegate_0_8 implements AMQMessageDelegate
{
if (destination == null)
{
- throw new IllegalArgumentException("Null destination not allowed");
+ getContentHeaderProperties().setReplyTo((String) null);
+ return; // We're done here
}
if (!(destination instanceof AMQDestination))