1 files changed, 23 insertions, 5 deletions
diff --git a/java/broker/src/main/java/org/apache/qpid/server/message/MessageMetaData_1_0.java b/java/broker/src/main/java/org/apache/qpid/server/message/MessageMetaData_1_0.java
index 7d030fe711..2cc1a92853 100755
--- a/java/broker/src/main/java/org/apache/qpid/server/message/MessageMetaData_1_0.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/message/MessageMetaData_1_0.java
@@ -21,11 +21,7 @@
 package org.apache.qpid.server.message;
 
 import java.nio.ByteBuffer;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
 import org.apache.qpid.amqp_1_0.codec.ValueHandler;
 import org.apache.qpid.amqp_1_0.messaging.SectionDecoder;
 import org.apache.qpid.amqp_1_0.type.AmqpErrorException;
@@ -486,6 +482,18 @@ public class MessageMetaData_1_0 implements StorableMessageMetaData
             return null;  //TODO
         }
 
+        public String getAppId()
+        {
+            //TODO
+            return null;
+        }
+
+        public String getUserId()
+        {
+            // TODO
+            return null;
+        }
+
         public Object getHeader(final String name)
         {
             return _appProperties == null ? null : _appProperties.get(name);
@@ -508,6 +516,16 @@ public class MessageMetaData_1_0 implements StorableMessageMetaData
             return true;
         }
 
+        @Override
+        public Collection<String> getHeaderNames()
+        {
+            if(_appProperties == null)
+            {
+                return Collections.emptySet();
+            }
+            return Collections.unmodifiableCollection(_appProperties.keySet());
+        }
+
         public boolean containsHeader(final String name)
         {
             return _appProperties != null && _appProperties.containsKey(name);