bitmessage/MessagePack
bitmessage/MessagePack
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Improved test, fixed bug

Browse Source
This commit is contained in:
Christian Basler 2017-01-23 22:33:39 +01:00
parent def99f7a7c
commit 7a84d1e220
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/ch/dissem/msgpack/types/MPString.java
View File

@ -66,7 +66,8 @@ public class MPString implements MPType<String>, CharSequence {
} }
public void pack(OutputStream out) throws IOException { public void pack(OutputStream out) throws IOException {
int size = value.length(); byte[] bytes = value.getBytes(encoding);
int size = bytes.length;
if (size < 32) { if (size < 32) {
out.write(FIXSTR_PREFIX + size); out.write(FIXSTR_PREFIX + size);
} else if (size < STR8_LIMIT) { } else if (size < STR8_LIMIT) {
@ -79,7 +80,7 @@ public class MPString implements MPType<String>, CharSequence {
out.write(STR32_PREFIX); out.write(STR32_PREFIX);
out.write(ByteBuffer.allocate(4).putInt(size).array()); out.write(ByteBuffer.allocate(4).putInt(size).array());
} }
out.write(value.getBytes(encoding)); out.write(bytes);
} }
@Override @Override

2
src/test/java/ch/dissem/msgpack/ReaderTest.java
View File

@ -63,7 +63,7 @@ public class ReaderTest {
new MPInteger(42), new MPInteger(42),
new MPMap<>(new HashMap<MPNil, MPNil>()), new MPMap<>(new HashMap<MPNil, MPNil>()),
new MPNil(), new MPNil(),
new MPString("yay!") // TODO: emoji new MPString("yay! \uD83E\uDD13")
); );
ByteArrayOutputStream out = new ByteArrayOutputStream(); ByteArrayOutputStream out = new ByteArrayOutputStream();
array.pack(out); array.pack(out);