2 files changed, 18 insertions, 1 deletions
diff --git a/qpid/java/common/src/main/java/org/apache/qpid/transport/Binary.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/Binary.java
index 4e97855a6f..491a7ac218 100644
--- a/qpid/java/common/src/main/java/org/apache/qpid/transport/Binary.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/Binary.java
@@ -142,4 +142,13 @@ public final class Binary
         return str(ByteBuffer.wrap(bytes, offset, size));
     }
 
+    public boolean hasExcessCapacity()
+    {
+        return size != bytes.length;
+    }
+
+    public Binary copy()
+    {
+        return new Binary(getBytes());
+    }
 }
diff --git a/qpid/java/common/src/main/java/org/apache/qpid/transport/codec/AbstractDecoder.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/codec/AbstractDecoder.java
index a8a4997ae7..09ce6a7eb1 100644
--- a/qpid/java/common/src/main/java/org/apache/qpid/transport/codec/AbstractDecoder.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/codec/AbstractDecoder.java
@@ -143,10 +143,18 @@ abstract class AbstractDecoder implements Decoder
         short size = readUint8();
         Binary bin = get(size);
         String str = str8cache.get(bin);
+
         if (str == null)
         {
             str = decode(bin.array(), bin.offset(), bin.size(), "UTF-8");
-            str8cache.put(bin, str);
+            if(bin.hasExcessCapacity())
+            {
+                str8cache.put(bin.copy(), str);
+            }
+            else
+            {
+                str8cache.put(bin, str);
+            }
         }
         return str;
     }