changeset 6:8d782f988d92

refactor
author sugi
date Fri, 09 Jan 2015 15:14:00 +0900
parents efe621b1dba9
children e7e55c455e39
files src/main/java/org/msgpack/io/StreamInput.java src/main/java/org/msgpack/unpacker/MessagePackBufferUnpacker.java src/main/java/org/msgpack/unpacker/MessagePackUnpacker.java
diffstat 3 files changed, 6 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/src/main/java/org/msgpack/io/StreamInput.java	Fri Jan 09 14:19:23 2015 +0900
+++ b/src/main/java/org/msgpack/io/StreamInput.java	Fri Jan 09 15:14:00 2015 +0900
@@ -112,9 +112,4 @@
         in.close();
     }
 
-    public byte[] getRawByteArray(int len) throws IOException {
-        byte[] b = new byte[len];
-        read(b, 0, len);
-        return b;
-    }
 }
--- a/src/main/java/org/msgpack/unpacker/MessagePackBufferUnpacker.java	Fri Jan 09 14:19:23 2015 +0900
+++ b/src/main/java/org/msgpack/unpacker/MessagePackBufferUnpacker.java	Fri Jan 09 15:14:00 2015 +0900
@@ -22,7 +22,6 @@
 
 import org.msgpack.MessagePack;
 import org.msgpack.io.LinkedBufferInput;
-import org.msgpack.io.StreamInput;
 
 public class MessagePackBufferUnpacker extends MessagePackUnpacker implements BufferUnpacker {
     private static final int DEFAULT_BUFFER_SIZE = 512; // TODO default buffer
@@ -108,6 +107,8 @@
     }
 
     public byte[] getSerializedByteArray(int len) throws IOException {
-        return ((StreamInput)in).getRawByteArray(len);
+        byte[] b = new byte[len];
+        in.read(b, 0, b.length);
+        return b;
     }
 }
--- a/src/main/java/org/msgpack/unpacker/MessagePackUnpacker.java	Fri Jan 09 14:19:23 2015 +0900
+++ b/src/main/java/org/msgpack/unpacker/MessagePackUnpacker.java	Fri Jan 09 15:14:00 2015 +0900
@@ -684,6 +684,8 @@
     }
 
     public byte[] getSerializedByteArray(int len) throws IOException {
-        return ((StreamInput)in).getRawByteArray(len);
+        byte[] b = new byte[len];
+        in.read(b, 0, b.length);
+        return b;
     }
 }