You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by rg...@apache.org on 2009/08/27 16:41:24 UTC
svn commit: r808437 - in
/qpid/branches/java-broker-0-10/qpid/java/broker/src/main/java/org/apache/qpid/server:
queue/AMQQueueFactory.java subscription/Subscription_0_10.java
Author: rgodfrey
Date: Thu Aug 27 14:41:24 2009
New Revision: 808437
URL: http://svn.apache.org/viewvc?rev=808437&view=rev
Log:
updates to pass python tests
Modified:
qpid/branches/java-broker-0-10/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/AMQQueueFactory.java
qpid/branches/java-broker-0-10/qpid/java/broker/src/main/java/org/apache/qpid/server/subscription/Subscription_0_10.java
Modified: qpid/branches/java-broker-0-10/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/AMQQueueFactory.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-0-10/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/AMQQueueFactory.java?rev=808437&r1=808436&r2=808437&view=diff
==============================================================================
--- qpid/branches/java-broker-0-10/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/AMQQueueFactory.java (original)
+++ qpid/branches/java-broker-0-10/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/AMQQueueFactory.java Thu Aug 27 14:41:24 2009
@@ -94,7 +94,7 @@
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)
Modified: qpid/branches/java-broker-0-10/qpid/java/broker/src/main/java/org/apache/qpid/server/subscription/Subscription_0_10.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-0-10/qpid/java/broker/src/main/java/org/apache/qpid/server/subscription/Subscription_0_10.java?rev=808437&r1=808436&r2=808437&view=diff
==============================================================================
--- qpid/branches/java-broker-0-10/qpid/java/broker/src/main/java/org/apache/qpid/server/subscription/Subscription_0_10.java (original)
+++ qpid/branches/java-broker-0-10/qpid/java/broker/src/main/java/org/apache/qpid/server/subscription/Subscription_0_10.java Thu Aug 27 14:41:24 2009
@@ -43,6 +43,7 @@
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 @@
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);
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org