Author: rajith
Date: Wed Mar 9 21:14:05 2011
New Revision: 1080001
URL: http://svn.apache.org/viewvc?rev=1080001&view=rev
Log:
Porting rev 1078961 from Qpid trunk to the 0.10 release branch.
Modified:
qpid/branches/0.10/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer_0_10.java
qpid/branches/0.10/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageProducer_0_10.java
Modified:
qpid/branches/0.10/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer_0_10.java
URL:
http://svn.apache.org/viewvc/qpid/branches/0.10/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer_0_10.java?rev=1080001&r1=1080000&r2=1080001&view=diff
==============================================================================
---
qpid/branches/0.10/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer_0_10.java
(original)
+++
qpid/branches/0.10/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer_0_10.java
Wed Mar 9 21:14:05 2011
@@ -23,6 +23,7 @@ import org.apache.qpid.client.AMQDestina
import org.apache.qpid.client.AMQDestination.DestSyntax;
import org.apache.qpid.client.failover.FailoverException;
import org.apache.qpid.client.message.*;
+import org.apache.qpid.client.messaging.address.Node.QueueNode;
import org.apache.qpid.client.protocol.AMQProtocolHandler;
import org.apache.qpid.framing.AMQShortString;
import org.apache.qpid.framing.FieldTable;
@@ -515,7 +516,7 @@ public class BasicMessageConsumer_0_10 e
void cleanupQueue() throws AMQException, FailoverException
{
AMQDestination dest = this.getDestination();
- if (dest.getDestSyntax() == AMQDestination.DestSyntax.ADDR)
+ if (dest != null && dest.getDestSyntax() ==
AMQDestination.DestSyntax.ADDR)
{
if (dest.getDelete() == AddressOption.ALWAYS ||
dest.getDelete() == AddressOption.RECEIVER )
Modified:
qpid/branches/0.10/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageProducer_0_10.java
URL:
http://svn.apache.org/viewvc/qpid/branches/0.10/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageProducer_0_10.java?rev=1080001&r1=1080000&r2=1080001&view=diff
==============================================================================
---
qpid/branches/0.10/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageProducer_0_10.java
(original)
+++
qpid/branches/0.10/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageProducer_0_10.java
Wed Mar 9 21:14:05 2011
@@ -34,6 +34,7 @@ import org.apache.qpid.client.AMQDestina
import org.apache.qpid.client.AMQDestination.DestSyntax;
import org.apache.qpid.client.message.AMQMessageDelegate_0_10;
import org.apache.qpid.client.message.AbstractJMSMessage;
+import org.apache.qpid.client.messaging.address.Node.QueueNode;
import org.apache.qpid.client.protocol.AMQProtocolHandler;
import org.apache.qpid.transport.DeliveryProperties;
import org.apache.qpid.transport.Header;
@@ -246,7 +247,7 @@ public class BasicMessageProducer_0_10 e
{
super.close();
AMQDestination dest = _destination;
- if (dest.getDestSyntax() == AMQDestination.DestSyntax.ADDR)
+ if (dest != null && dest.getDestSyntax() ==
AMQDestination.DestSyntax.ADDR)
{
if (dest.getDelete() == AddressOption.ALWAYS ||
dest.getDelete() == AddressOption.SENDER )
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:[email protected]
