ICE-5311 - more fixes

2 files changed, 5 insertions, 22 deletions

diff --git a/java/src/Freeze/MapInternal/Index.java b/java/src/Freeze/MapInternal/Index.java
index 63d6250d2ef..de8e93e2a9e 100644
--- a/java/src/Freeze/MapInternal/Index.java
+++ b/java/src/Freeze/MapInternal/Index.java
@@ -389,14 +389,14 @@ public abstract class Index<K, V, I>
 
     ByteBuffer encodeKey(I k)
     {
-        IceInternal.BasicStream str = createWriteStream();
+        IceInternal.BasicStream str = _map.createWriteStream();
         encodeKey(k, str);
         return str.prepareWrite().b;
     }
 
     I decodeKey(ByteBuffer buf)
     {
-        return decodeKey(createReadStream(buf));
+        return decodeKey(_map.createReadStream(buf));
     }
 
     I decodeKey(com.sleepycat.db.DatabaseEntry entry)
@@ -404,34 +404,16 @@ public abstract class Index<K, V, I>
         ByteBuffer b = entry.getDataNIO();
         if(b != null)
         {
-            return decodeKey(createReadStream(b));
+            return decodeKey(_map.createReadStream(b));
         }
         else
         {
             byte[] arr = entry.getData();
             assert(arr != null && entry.getOffset() == 0 && entry.getSize() == arr.length);
-            return decodeKey(createReadStream(arr));
+            return decodeKey(_map.createReadStream(arr));
         }
     }
 
-    IceInternal.BasicStream createWriteStream()
-    {
-        return new IceInternal.BasicStream(IceInternal.Util.getInstance(_map.connection().getCommunicator()),
-                                           _map.connection().getEncoding(), true, false);
-    }
-
-    IceInternal.BasicStream createReadStream(byte[] arr)
-    {
-        return new IceInternal.BasicStream(IceInternal.Util.getInstance(_map.connection().getCommunicator()),
-                                           _map.connection().getEncoding(), arr);
-    }
-
-    IceInternal.BasicStream createReadStream(ByteBuffer buf)
-    {
-        return new IceInternal.BasicStream(IceInternal.Util.getInstance(_map.connection().getCommunicator()),
-                                           _map.connection().getEncoding(), buf);
-    }
-
     com.sleepycat.db.SecondaryDatabase
     db()
     {
diff --git a/java/src/Freeze/MapInternal/MapI.java b/java/src/Freeze/MapInternal/MapI.java
index 9e30a2ad3b0..10bd15dbb40 100644
--- a/java/src/Freeze/MapInternal/MapI.java
+++ b/java/src/Freeze/MapInternal/MapI.java
@@ -1134,6 +1134,7 @@ public abstract class MapI<K, V> extends java.util.AbstractMap<K, V>
 
     IceInternal.BasicStream createReadStream(ByteBuffer buf)
     {
+        buf.rewind();
         return new IceInternal.BasicStream(IceInternal.Util.getInstance(_communicator), _encoding, buf);
     }