NO-JIRA : AMQP-1-0 sandbox updates - merge from trunkrg-amqp-1-0-sandbox

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

1 files changed, 13 insertions, 18 deletions

diff --git a/qpid/java/client/src/main/java/org/apache/qpid/client/message/AMQPEncodedMapMessage.java b/qpid/java/client/src/main/java/org/apache/qpid/client/message/AMQPEncodedMapMessage.java
index be71c8c657..11d99f5446 100644
--- a/qpid/java/client/src/main/java/org/apache/qpid/client/message/AMQPEncodedMapMessage.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/message/AMQPEncodedMapMessage.java
@@ -21,18 +21,17 @@ package org.apache.qpid.client.message;
  */
 
 
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-import java.nio.ByteBuffer;
-
-import javax.jms.JMSException;
-import javax.jms.MessageFormatException;
-
 import org.apache.qpid.AMQException;
 import org.apache.qpid.transport.codec.BBDecoder;
 import org.apache.qpid.transport.codec.BBEncoder;
 
+import javax.jms.JMSException;
+import javax.jms.MessageFormatException;
+import java.nio.ByteBuffer;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+
 public class AMQPEncodedMapMessage extends JMSMapMessage
 {
     public static final String MIME_TYPE = "amqp/map";
@@ -68,7 +67,7 @@ public class AMQPEncodedMapMessage extends JMSMapMessage
                 || (value instanceof Double) || (value instanceof String) || (value instanceof byte[])
                 || (value instanceof List) || (value instanceof Map) || (value instanceof UUID) || (value == null))
         {
-            _map.put(propName, value);
+            getMap().put(propName, value);
         }
         else
         {
@@ -82,7 +81,7 @@ public class AMQPEncodedMapMessage extends JMSMapMessage
     public ByteBuffer getData()
     {
         BBEncoder encoder = new BBEncoder(1024);
-        encoder.writeMap(_map);
+        encoder.writeMap(getMap());
         return encoder.segment();
     }
     
@@ -94,22 +93,18 @@ public class AMQPEncodedMapMessage extends JMSMapMessage
             data.rewind();
             BBDecoder decoder = new BBDecoder();
             decoder.init(data);
-            _map = decoder.readMap();
+            setMap(decoder.readMap());
         }
         else
         {
-            _map.clear();
+            getMap().clear();
         }
     }
 
     // for testing
     public Map<String,Object> getMap()
     {
-        return _map;
-    }
-    
-    void setMap(Map<String,Object> map)
-    {
-        _map = map;
+        return super.getMap();
     }
+
 }