NO-JIRA: [AMQP 1-0 Sandbox] merging from trunk

git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/rg-amqp-1-0-sandbox@1295635 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 19 insertions, 0 deletions

diff --git a/qpid/java/client/src/main/java/org/apache/qpid/client/AMQDestination.java b/qpid/java/client/src/main/java/org/apache/qpid/client/AMQDestination.java
index 92602ac3a2..61fe722423 100644
--- a/qpid/java/client/src/main/java/org/apache/qpid/client/AMQDestination.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/AMQDestination.java
@@ -151,6 +151,10 @@ public abstract class AMQDestination implements Destination, Referenceable
         return defaultDestSyntax;
     }
 
+    protected AMQDestination()
+    {  
+    }
+
     protected AMQDestination(Address address) throws Exception
     {
         this._address = address;
@@ -186,6 +190,11 @@ public abstract class AMQDestination implements Destination, Referenceable
     
     protected AMQDestination(String str) throws URISyntaxException
     {
+        parseDestinationString(str);
+    }
+
+    protected void parseDestinationString(String str) throws URISyntaxException
+    {
         _destSyntax = getDestType(str);
         str = stripSyntaxPrefix(str);
         if (_destSyntax == DestSyntax.BURL)
@@ -305,6 +314,16 @@ public abstract class AMQDestination implements Destination, Referenceable
         }
     }
 
+    public void setDestinationString(String str) throws Exception
+    {
+        parseDestinationString(str);
+    }
+
+    public String getDestinationString()
+    {
+        return toString();
+    }
+
     public DestSyntax getDestSyntax() 
     {
         return _destSyntax;