From 780215c0557e8388a000de1dd8de7b5d53715347 Mon Sep 17 00:00:00 2001
From: Keith Wall <kwall@apache.org>
Date: Thu, 14 Aug 2014 21:58:30 +0000
Subject: QPID-6001: [Java Client] Prevent NPE when publishing using ADDR
 destination to Broker using AMQP 0-9-1 or lower

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1618073 13f79535-47bb-0310-9956-ffa450edef68
---
 .../src/main/java/org/apache/qpid/client/AMQSession_0_8.java       | 7 ++++++-
 .../main/java/org/apache/qpid/client/BasicMessageProducer_0_8.java | 6 ++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

(limited to 'qpid/java')

diff --git a/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession_0_8.java b/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession_0_8.java
index 3ff7416d8f..ef0d023fb2 100644
--- a/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession_0_8.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession_0_8.java
@@ -735,9 +735,14 @@ public class AMQSession_0_8 extends AMQSession<BasicMessageConsumer_0_8, BasicMe
     public void resolveAddress(AMQDestination dest,
                                               boolean isConsumer,
                                               boolean noLocal) throws AMQException
+    {
+        throwUnsupportedAddressingSyntax();
+    }
+
+    void throwUnsupportedAddressingSyntax()
     {
         throw new UnsupportedOperationException("The new addressing based syntax is "
-                + "not supported for AMQP 0-8/0-9 versions");
+                + "not supported for AMQP 0-8/0-9/0-9-1 versions");
     }
 
     protected void flushAcknowledgments()
diff --git a/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageProducer_0_8.java b/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageProducer_0_8.java
index 3cb723e5a8..ed517d38a7 100644
--- a/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageProducer_0_8.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageProducer_0_8.java
@@ -57,6 +57,12 @@ public class BasicMessageProducer_0_8 extends BasicMessageProducer
 
     void declareDestination(AMQDestination destination)
     {
+
+        if (destination.getDestSyntax() == AMQDestination.DestSyntax.ADDR)
+        {
+            getSession().throwUnsupportedAddressingSyntax();
+        }
+
         if(getSession().isDeclareExchanges())
         {
             final MethodRegistry methodRegistry = getSession().getMethodRegistry();
-- 
cgit v1.2.1