QPID-3766 Committing a patch by Weston Price.

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

1 files changed, 13 insertions, 12 deletions

diff --git a/qpid/java/common/src/main/java/org/apache/qpid/messaging/Address.java b/qpid/java/common/src/main/java/org/apache/qpid/messaging/Address.java
index 2c7fe7b8ed..d9c12148cb 100644
--- a/qpid/java/common/src/main/java/org/apache/qpid/messaging/Address.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/messaging/Address.java
@@ -35,41 +35,42 @@ import static org.apache.qpid.messaging.util.PyPrint.pprint;
 public class Address
 {
 
+    private String _name;
+    private String _subject;
+    private Map _options;
+    private final String _myToString;
+
     public static Address parse(String address)
     {
         return new AddressParser(address).parse();
     }
 
-    private String name;
-    private String subject;
-    private Map options;
-
     public Address(String name, String subject, Map options)
     {
-        this.name = name;
-        this.subject = subject;
-        this.options = options;
+        this._name = name;
+        this._subject = subject;
+        this._options = options;
+        this._myToString = String.format("%s/%s; %s", pprint(_name), pprint(_subject), pprint(_options));
     }
 
     public String getName()
     {
-        return name;
+        return _name;
     }
 
     public String getSubject()
     {
-        return subject;
+        return _subject;
     }
 
     public Map getOptions()
     {
-        return options;
+        return _options;
     }
 
     public String toString()
     {
-        return String.format("%s/%s; %s", pprint(name), pprint(subject),
-                             pprint(options));
+        return _myToString;
     }
 
 }