diff options
| author | Robert Godfrey <rgodfrey@apache.org> | 2009-08-27 14:41:24 +0000 |
|---|---|---|
| committer | Robert Godfrey <rgodfrey@apache.org> | 2009-08-27 14:41:24 +0000 |
| commit | c9f30c4dc9fbdce7a944b1aca5342f420b564b78 (patch) | |
| tree | 2c91fa16ffbf56ae5a474d28b09b47991de90022 | |
| parent | 9f72bbe223c7b0cbb587cf4208d50fa6c7081499 (diff) | |
| download | qpid-python-c9f30c4dc9fbdce7a944b1aca5342f420b564b78.tar.gz | |
updates to pass python tests
git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/java-broker-0-10@808437 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | qpid/java/broker/src/main/java/org/apache/qpid/server/queue/AMQQueueFactory.java | 2 | ||||
| -rw-r--r-- | qpid/java/broker/src/main/java/org/apache/qpid/server/subscription/Subscription_0_10.java | 7 |
2 files changed, 7 insertions, 2 deletions
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/AMQQueueFactory.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/AMQQueueFactory.java index f31fbd6ad0..71831efc7b 100644 --- a/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/AMQQueueFactory.java +++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/AMQQueueFactory.java @@ -94,7 +94,7 @@ public class AMQQueueFactory throws AMQException { int priorities = 1; - if(arguments.containsKey(X_QPID_PRIORITIES)) + if(arguments != null && arguments.containsKey(X_QPID_PRIORITIES)) { Object prioritiesObj = arguments.get(X_QPID_PRIORITIES); if(prioritiesObj instanceof Number) diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/subscription/Subscription_0_10.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/subscription/Subscription_0_10.java index 5cecf0cd05..3bf551dd03 100644 --- a/qpid/java/broker/src/main/java/org/apache/qpid/server/subscription/Subscription_0_10.java +++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/subscription/Subscription_0_10.java @@ -43,6 +43,7 @@ import java.util.concurrent.atomic.AtomicReference; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.ConcurrentHashMap; import java.util.ArrayList; +import java.nio.ByteBuffer; public class Subscription_0_10 implements Subscription, FlowCreditManager.FlowCreditManagerListener { @@ -242,7 +243,11 @@ public class Subscription_0_10 implements Subscription, FlowCreditManager.FlowCr MessageTransfer xfr = new MessageTransfer(); xfr.setDestination(_destination); - xfr.setBody(msg.getBody()); + if(msg.getBody() != null) + { + xfr.setBody(msg.getBody()); + } + xfr.setAcceptMode(_acceptMode); xfr.setAcquireMode(_acquireMode); |