From 1784746e7e964a4ee4a22dfcd8dfc04ce743e404 Mon Sep 17 00:00:00 2001 From: moaikids Date: Thu, 1 Apr 2010 23:13:56 +0900 Subject: [PATCH 1/2] fix: CS_MAP_16 deserialize bug(line.388) --- java/src/org/msgpack/impl/UnpackerImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java/src/org/msgpack/impl/UnpackerImpl.java b/java/src/org/msgpack/impl/UnpackerImpl.java index ddf99400..adc62b09 100644 --- a/java/src/org/msgpack/impl/UnpackerImpl.java +++ b/java/src/org/msgpack/impl/UnpackerImpl.java @@ -385,11 +385,11 @@ public class UnpackerImpl { obj = new Object[count*2]; if(count == 0) { break _push; } // FIXME check IMapSchema //System.out.println("fixmap count:"+count); + ++top; stack_obj[top] = top_obj; stack_ct[top] = top_ct; stack_count[top] = top_count; stack_schema[top] = top_schema; - ++top; top_obj = obj; top_ct = CT_MAP_KEY; top_count = count; From 3416cf984e31dfd9706166d6113c48318ef4b08d Mon Sep 17 00:00:00 2001 From: moaikids Date: Thu, 1 Apr 2010 23:15:36 +0900 Subject: [PATCH 2/2] fix: org.msgpack.impl.UnpackerImpl.java CS_MAP_16 deserialize bug(line.388) --- java/build.xml | 2 +- java/src/org/msgpack/Packer.java | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/java/build.xml b/java/build.xml index 40d7d614..b98f7c38 100644 --- a/java/build.xml +++ b/java/build.xml @@ -13,6 +13,6 @@ - + diff --git a/java/src/org/msgpack/Packer.java b/java/src/org/msgpack/Packer.java index ebd84022..935728d2 100644 --- a/java/src/org/msgpack/Packer.java +++ b/java/src/org/msgpack/Packer.java @@ -20,7 +20,6 @@ package org.msgpack; import java.io.OutputStream; import java.io.IOException; import java.nio.ByteBuffer; -import java.nio.charset.Charset; import java.util.List; import java.util.Map;