Merge branch 'master' of github.com:msgpack/msgpack-java

muga · muga · commit 5a239f11d605 · 2014-02-09T19:14:20.000-08:00
diff --git a/.travis.yml b/.travis.yml
@@ -6,7 +6,9 @@ jdk:
 branches:
   only:
     - master
+    - develop
 notifications:
   email:
     - muga.nishizawa@gmail.com
     - ozawa.tsuyoshi@gmail.com
+    - leo@xerial.org
diff --git a/src/main/java/org/msgpack/unpacker/DoubleAccept.java b/src/main/java/org/msgpack/unpacker/DoubleAccept.java
@@ -24,10 +24,12 @@ final class DoubleAccept extends Accept {
         super("float");
     }
 
+    @Override
     void acceptFloat(float v) {
         this.value = (double) v;
     }
 
+    @Override
     void acceptDouble(double v) {
         this.value = v;
     }
diff --git a/src/test/java/org/msgpack/TestSet.java b/src/test/java/org/msgpack/TestSet.java
@@ -42,9 +42,9 @@ public void testBooleanArray(boolean[] v) throws Exception {
     }
 
     public void testByte() throws Exception {
-	testShort((byte) 0);
-	testShort((byte) -1);
-	testShort((byte) 1);
+	testByte((byte) 0);
+	testByte((byte) -1);
+	testByte((byte) 1);
 	testByte(Byte.MIN_VALUE);
 	testByte(Byte.MAX_VALUE);
 	byte[] bytes = new byte[1000];

Original file line number	Diff line number	Diff line change
`@@ -24,10 +24,12 @@ final class DoubleAccept extends Accept {`
`24`	`24`	`super("float");`
`25`	`25`	`}`
`26`	`26`
	`27`	`+ @Override`
`27`	`28`	`void acceptFloat(float v) {`
`28`	`29`	`this.value = (double) v;`
`29`	`30`	`}`
`30`	`31`
	`32`	`+ @Override`
`31`	`33`	`void acceptDouble(double v) {`
`32`	`34`	`this.value = v;`
`33`	`35`	`}`