mirror of
https://github.com/msgpack/msgpack-c.git
synced 2025-10-18 19:48:46 +02:00
Merge branch 'master' of github.com:msgpack/msgpack
This commit is contained in:
@@ -13,6 +13,6 @@
|
|||||||
</javac>
|
</javac>
|
||||||
</target>
|
</target>
|
||||||
<target name="jar" depends="compile">
|
<target name="jar" depends="compile">
|
||||||
<jar jarfile="dist/msgpack-0.0.0.jar" basedir="build" />
|
<jar jarfile="dist/msgpack-0.0.1.jar" basedir="build" />
|
||||||
</target>
|
</target>
|
||||||
</project>
|
</project>
|
||||||
|
@@ -20,7 +20,6 @@ package org.msgpack;
|
|||||||
import java.io.OutputStream;
|
import java.io.OutputStream;
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.nio.ByteBuffer;
|
import java.nio.ByteBuffer;
|
||||||
import java.nio.charset.Charset;
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
|
||||||
|
@@ -385,11 +385,11 @@ public class UnpackerImpl {
|
|||||||
obj = new Object[count*2];
|
obj = new Object[count*2];
|
||||||
if(count == 0) { break _push; } // FIXME check IMapSchema
|
if(count == 0) { break _push; } // FIXME check IMapSchema
|
||||||
//System.out.println("fixmap count:"+count);
|
//System.out.println("fixmap count:"+count);
|
||||||
|
++top;
|
||||||
stack_obj[top] = top_obj;
|
stack_obj[top] = top_obj;
|
||||||
stack_ct[top] = top_ct;
|
stack_ct[top] = top_ct;
|
||||||
stack_count[top] = top_count;
|
stack_count[top] = top_count;
|
||||||
stack_schema[top] = top_schema;
|
stack_schema[top] = top_schema;
|
||||||
++top;
|
|
||||||
top_obj = obj;
|
top_obj = obj;
|
||||||
top_ct = CT_MAP_KEY;
|
top_ct = CT_MAP_KEY;
|
||||||
top_count = count;
|
top_count = count;
|
||||||
|
Reference in New Issue
Block a user