QPID-50 : Patch supplied by Rob Godfrey - Virtual Host implementation

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

2 files changed, 13 insertions, 0 deletions

diff --git a/qpid/java/common/src/main/java/org/apache/qpid/exchange/ExchangeDefaults.java b/qpid/java/common/src/main/java/org/apache/qpid/exchange/ExchangeDefaults.java
index 57159f3802..172f1b1790 100644
--- a/qpid/java/common/src/main/java/org/apache/qpid/exchange/ExchangeDefaults.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/exchange/ExchangeDefaults.java
@@ -39,4 +39,10 @@ public class ExchangeDefaults
     public final static AMQShortString FANOUT_EXCHANGE_NAME = new AMQShortString("amq.fanout");
 
     public final static AMQShortString FANOUT_EXCHANGE_CLASS = new AMQShortString("fanout");
+
+
+    public final static AMQShortString SYSTEM_MANAGEMENT_EXCHANGE_NAME = new AMQShortString("qpid.sysmgmt");
+
+    public final static AMQShortString SYSTEM_MANAGEMENT_CLASS = new AMQShortString("sysmmgmt");
+
 }
diff --git a/qpid/java/common/src/main/java/org/apache/qpid/framing/BasicContentHeaderProperties.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/BasicContentHeaderProperties.java
index b891c914ec..ed6ab63ded 100644
--- a/qpid/java/common/src/main/java/org/apache/qpid/framing/BasicContentHeaderProperties.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/BasicContentHeaderProperties.java
@@ -531,6 +531,13 @@ public class BasicContentHeaderProperties implements ContentHeaderProperties
         return _replyTo == null ? null : _replyTo.toString();
     }
 
+    public AMQShortString getReplyToAsShortString()
+    {
+        decodeIfNecessary();
+        return _replyTo;
+    }
+
+
     public void setReplyTo(String replyTo)
     {
         setReplyTo(replyTo == null ? null : new AMQShortString(replyTo));