QPID-366 : Reference counting not being decremented correctly and other persistence issues

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@508235 13f79535-47bb-0310-9956-ffa450edef68

4 files changed, 15 insertions, 14 deletions

diff --git a/java/client/src/main/java/org/apache/qpid/client/AMQBrokerDetails.java b/java/client/src/main/java/org/apache/qpid/client/AMQBrokerDetails.java
index 17ce6debbd..c04380ba8c 100644
--- a/java/client/src/main/java/org/apache/qpid/client/AMQBrokerDetails.java
+++ b/java/client/src/main/java/org/apache/qpid/client/AMQBrokerDetails.java
@@ -75,7 +75,7 @@ public class AMQBrokerDetails implements BrokerDetails
                         }
                         else
                         {
-                            URLHelper.parseError(0, transport.length(), "Unknown transport", url);
+                            throw URLHelper.parseError(0, transport.length(), "Unknown transport", url);
                         }
                     }
                 }
@@ -89,7 +89,7 @@ public class AMQBrokerDetails implements BrokerDetails
 
             if (transport == null)
             {
-                URLHelper.parseError(-1, "Unknown transport:'" + transport + "'" +
+                throw URLHelper.parseError(-1, "Unknown transport:'" + transport + "'" +
                                          " In broker URL:'" + url + "' Format: " + URL_FORMAT_EXAMPLE, "");
             }
 
@@ -144,7 +144,7 @@ public class AMQBrokerDetails implements BrokerDetails
                     }
                     else
                     {
-                        URLHelper.parseError(connection.toString().indexOf(connection.getAuthority()) + end - 1,
+                        throw URLHelper.parseError(connection.toString().indexOf(connection.getAuthority()) + end - 1,
                                              "Illegal character in port number", connection.toString());
                     }
 
@@ -172,7 +172,7 @@ public class AMQBrokerDetails implements BrokerDetails
                 throw(URLSyntaxException) uris;
             }
 
-            URLHelper.parseError(uris.getIndex(), uris.getReason(), uris.getInput());
+            throw URLHelper.parseError(uris.getIndex(), uris.getReason(), uris.getInput());
         }
     }
 
diff --git a/java/client/src/main/java/org/apache/qpid/client/AMQConnectionURL.java b/java/client/src/main/java/org/apache/qpid/client/AMQConnectionURL.java
index 928aa55ea2..fea83d3128 100644
--- a/java/client/src/main/java/org/apache/qpid/client/AMQConnectionURL.java
+++ b/java/client/src/main/java/org/apache/qpid/client/AMQConnectionURL.java
@@ -68,7 +68,7 @@ public class AMQConnectionURL implements ConnectionURL
                 String uid = AMQConnectionFactory.getUniqueClientID();
                 if (uid == null)
                 {
-                    URLHelper.parseError(-1, "Client Name not specified", fullURL);
+                    throw URLHelper.parseError(-1, "Client Name not specified", fullURL);
                 }
                 else
                 {
@@ -106,7 +106,7 @@ public class AMQConnectionURL implements ConnectionURL
 
             if (userInfo == null)
             {
-                URLHelper.parseError(AMQ_PROTOCOL.length() + 3,
+                throw URLHelper.parseError(AMQ_PROTOCOL.length() + 3,
                         "User information not found on url", fullURL);
             }
             else
@@ -126,11 +126,11 @@ public class AMQConnectionURL implements ConnectionURL
                 int testIndex = start + authLength;
                 if (testIndex < fullURL.length() && fullURL.charAt(testIndex) == '?')
                 {
-                    URLHelper.parseError(start, testIndex - start, "Virtual host found", fullURL);
+                    throw URLHelper.parseError(start, testIndex - start, "Virtual host found", fullURL);
                 }
                 else
                 {
-                    URLHelper.parseError(-1, "Virtual host not specified", fullURL);
+                    throw URLHelper.parseError(-1, "Virtual host not specified", fullURL);
                 }
 
             }
@@ -155,17 +155,17 @@ public class AMQConnectionURL implements ConnectionURL
 
             if (slash == -1)
             {
-                URLHelper.parseError(uris.getIndex(), uris.getReason(), uris.getInput());
+                throw URLHelper.parseError(uris.getIndex(), uris.getReason(), uris.getInput());
             }
             else
             {
                 if (slash != 0 && fullURL.charAt(slash - 1) == ':')
                 {
-                    URLHelper.parseError(slash - 2, fullURL.indexOf('?') - slash + 2, "Virtual host looks like a windows path, forward slash not allowed in URL", fullURL);
+                    throw URLHelper.parseError(slash - 2, fullURL.indexOf('?') - slash + 2, "Virtual host looks like a windows path, forward slash not allowed in URL", fullURL);
                 }
                 else
                 {
-                    URLHelper.parseError(slash, "Forward slash not allowed in URL", fullURL);
+                    throw URLHelper.parseError(slash, "Forward slash not allowed in URL", fullURL);
                 }
             }
 
@@ -180,7 +180,7 @@ public class AMQConnectionURL implements ConnectionURL
 
         if (colonIndex == -1)
         {
-            URLHelper.parseError(AMQ_PROTOCOL.length() + 3, userinfo.length(),
+            throw URLHelper.parseError(AMQ_PROTOCOL.length() + 3, userinfo.length(),
                     "Null password in user information not allowed.", _url);
         }
         else
diff --git a/java/client/src/main/java/org/apache/qpid/client/AMQDestination.java b/java/client/src/main/java/org/apache/qpid/client/AMQDestination.java
index 0698da3eba..a994dbc670 100644
--- a/java/client/src/main/java/org/apache/qpid/client/AMQDestination.java
+++ b/java/client/src/main/java/org/apache/qpid/client/AMQDestination.java
@@ -76,7 +76,7 @@ public abstract class AMQDestination implements Destination, Referenceable
         _isExclusive = Boolean.parseBoolean(binding.getOption(BindingURL.OPTION_EXCLUSIVE));
         _isAutoDelete = Boolean.parseBoolean(binding.getOption(BindingURL.OPTION_AUTODELETE));
         _isDurable = Boolean.parseBoolean(binding.getOption(BindingURL.OPTION_DURABLE));
-        _queueName = new AMQShortString(binding.getQueueName());
+        _queueName = binding.getQueueName() == null ? null : new AMQShortString(binding.getQueueName());
     }
 
     protected AMQDestination(AMQShortString exchangeName, AMQShortString exchangeClass, AMQShortString destinationName, AMQShortString queueName)
diff --git a/java/client/src/main/java/org/apache/qpid/client/message/JMSTextMessage.java b/java/client/src/main/java/org/apache/qpid/client/message/JMSTextMessage.java
index bf975c426c..c05667902f 100644
--- a/java/client/src/main/java/org/apache/qpid/client/message/JMSTextMessage.java
+++ b/java/client/src/main/java/org/apache/qpid/client/message/JMSTextMessage.java
@@ -28,6 +28,7 @@ import javax.jms.JMSException;
 
 import org.apache.mina.common.ByteBuffer;
 import org.apache.qpid.AMQException;
+import org.apache.qpid.client.CustomJMSXProperty;
 import org.apache.qpid.framing.AMQShortString;
 import org.apache.qpid.framing.BasicContentHeaderProperties;
 
@@ -42,7 +43,7 @@ public class JMSTextMessage extends AbstractJMSMessage implements javax.jms.Text
     /**
      * This constant represents the name of a property that is set when the message payload is null.
      */
-    private static final AMQShortString PAYLOAD_NULL_PROPERTY = new AMQShortString("JMS_QPID_NULL");
+    private static final AMQShortString PAYLOAD_NULL_PROPERTY = CustomJMSXProperty.JMS_AMQP_NULL.getShortStringName();
     private static final Charset DEFAULT_CHARSET = Charset.forName("UTF-8");
 
     public JMSTextMessage() throws JMSException