java: Merged file in .settings manually

This commit is contained in:
Muga Nishizawa
2011-06-27 10:54:32 +09:00
12 changed files with 132 additions and 29 deletions
+3 -1
View File
@@ -3,7 +3,7 @@
<info organisation="org"
module="${name}" revision="${version}">
<ivyauthor name="MessagePack Project" url="http://msgpack.sourceforge.net/"/>
<ivyauthor name="MessagePack Project" url="http://msgpack.org/"/>
<description>MessagePack</description>
</info>
@@ -15,5 +15,7 @@
<dependencies>
<dependency org="junit" name="junit" rev="4.8.1" conf="test->default"/>
<dependency org="javassist" name="javassist" rev="3.12.1.GA"/>
<dependency org="org.slf4j" name="slf4j-api" rev="1.4.3"/>
</dependencies>
</ivy-module>
@@ -26,7 +26,7 @@ import org.msgpack.template.FieldList;
public class MessagePack {
public static byte[] pack(Object obj) {
ByteArrayOutputStream out = new ByteArrayOutputStream();
ByteArrayOutputStream out = new ByteArrayOutputStream(1024);
try {
new Packer(out).pack(obj);
} catch (IOException e) {
@@ -40,7 +40,7 @@ public class MessagePack {
}
public static byte[] pack(Object obj, Template tmpl) throws MessageTypeException {
ByteArrayOutputStream out = new ByteArrayOutputStream();
ByteArrayOutputStream out = new ByteArrayOutputStream(1024);
try {
new Packer(out).pack(obj, tmpl);
} catch (IOException e) {