fixed NilValue.equals

frsyuki · frsyuki · commit f8299104a755 · 2011-08-12T19:58:39.000+09:00
diff --git a/src/main/java/org/msgpack/type/NilValue.java b/src/main/java/org/msgpack/type/NilValue.java
@@ -54,7 +54,13 @@ public void writeTo(Packer pk) throws IOException {
     }
 
     public boolean equals(Object o) {
-        return o == this;
+        if(o == this) {
+            return true;
+        }
+        if(!(o instanceof Value)) {
+            return false;
+        }
+        return ((Value) o).isNil();
     }
 
     public int hashCode() {
diff --git a/src/test/java/org/msgpack/type/TestEquals.java b/src/test/java/org/msgpack/type/TestEquals.java
@@ -190,6 +190,12 @@ public void testBigInteger(BigInteger v) throws Exception {
         }
     }
 
+    @Test
+    public void testNull() {
+        Value v1 = ValueFactory.nilValue();
+        Value v2 = ValueFactory.nilValue();
+        testEquals(v1, v2);
+    }
 
     private boolean compatibleWithByte(long v) {
        return (long)Byte.MIN_VALUE <= v && v <= (long)Byte.MAX_VALUE;

Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,13 @@ public void writeTo(Packer pk) throws IOException {`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`public boolean equals(Object o) {`
`57`		`- return o == this;`
	`57`	`+ if(o == this) {`
	`58`	`+ return true;`
	`59`	`+ }`
	`60`	`+ if(!(o instanceof Value)) {`
	`61`	`+ return false;`
	`62`	`+ }`
	`63`	`+ return ((Value) o).isNil();`
`58`	`64`	`}`
`59`	`65`
`60`	`66`	`public int hashCode() {`
Original file line number	Diff line number	Diff line change
`@@ -190,6 +190,12 @@ public void testBigInteger(BigInteger v) throws Exception {`
`190`	`190`	`}`
`191`	`191`	`}`
`192`	`192`
	`193`	`+ @Test`
	`194`	`+ public void testNull() {`
	`195`	`+ Value v1 = ValueFactory.nilValue();`
	`196`	`+ Value v2 = ValueFactory.nilValue();`
	`197`	`+ testEquals(v1, v2);`
	`198`	`+ }`
`193`	`199`
`194`	`200`	`private boolean compatibleWithByte(long v) {`
`195`	`201`	`return (long)Byte.MIN_VALUE <= v && v <= (long)Byte.MAX_VALUE;`