Tentative fix for #124 (and #125?)

Author: emacarron

src/main/java/org/apache/ibatis/cache/CacheKey.java

@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2012 the original author or authors.
+ *    Copyright 2009-2014 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -16,6 +16,7 @@
 package org.apache.ibatis.cache;
 
 import java.io.Serializable;
+import java.lang.reflect.Array;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -51,6 +52,18 @@ public int getUpdateCount() {
   }
 
   public void update(Object object) {
+    if (object != null && object.getClass().isArray()) {
+      int length = Array.getLength(object);
+      for (int i = 0; i < length; i++) {
+        Object element = Array.get(object, i);
+        doUpdate(element);
+      }
+    } else {
+      doUpdate(object);
+    }
+  }
+
+  private void doUpdate(Object object) {
     int baseHashCode = object == null ? 1 : object.hashCode();
 
     count++;
@@ -69,22 +82,29 @@ public void updateAll(Object[] objects) {
   }
 
   public boolean equals(Object object) {
-    if (this == object) return true;
-    if (!(object instanceof CacheKey)) return false;
+    if (this == object)
+      return true;
+    if (!(object instanceof CacheKey))
+      return false;
 
     final CacheKey cacheKey = (CacheKey) object;
 
-    if (hashcode != cacheKey.hashcode) return false;
-    if (checksum != cacheKey.checksum) return false;
-    if (count != cacheKey.count) return false;
+    if (hashcode != cacheKey.hashcode)
+      return false;
+    if (checksum != cacheKey.checksum)
+      return false;
+    if (count != cacheKey.count)
+      return false;
 
     for (int i = 0; i < updateList.size(); i++) {
       Object thisObject = updateList.get(i);
       Object thatObject = cacheKey.updateList.get(i);
       if (thisObject == null) {
-        if (thatObject != null) return false;
+        if (thatObject != null)
+          return false;
       } else {
-        if (!thisObject.equals(thatObject)) return false;
+        if (!thisObject.equals(thatObject))
+          return false;
       }
     }
     return true;

src/test/java/org/apache/ibatis/cache/CacheKeyTest.java

@@ -25,8 +25,8 @@ public class CacheKeyTest {
   @Test
   public void shouldTestCacheKeysEqual() {
     Date date = new Date();
-    CacheKey key1 = new CacheKey(new Object[]{1, "hello", null, new Date(date.getTime())});
-    CacheKey key2 = new CacheKey(new Object[]{1, "hello", null, new Date(date.getTime())});
+    CacheKey key1 = new CacheKey(new Object[] { 1, "hello", null, new Date(date.getTime()) });
+    CacheKey key2 = new CacheKey(new Object[] { 1, "hello", null, new Date(date.getTime()) });
     assertTrue(key1.equals(key2));
     assertTrue(key2.equals(key1));
     assertTrue(key1.hashCode() == key2.hashCode());
@@ -35,9 +35,9 @@ public void shouldTestCacheKeysEqual() {
 
   @Test
   public void shouldTestCacheKeysNotEqualDueToDateDifference() throws Exception {
-    CacheKey key1 = new CacheKey(new Object[]{1, "hello", null, new Date()});
+    CacheKey key1 = new CacheKey(new Object[] { 1, "hello", null, new Date() });
     Thread.sleep(1000);
-    CacheKey key2 = new CacheKey(new Object[]{1, "hello", null, new Date()});
+    CacheKey key2 = new CacheKey(new Object[] { 1, "hello", null, new Date() });
     assertFalse(key1.equals(key2));
     assertFalse(key2.equals(key1));
     assertFalse(key1.hashCode() == key2.hashCode());
@@ -46,9 +46,9 @@ public void shouldTestCacheKeysNotEqualDueToDateDifference() throws Exception {
 
   @Test
   public void shouldTestCacheKeysNotEqualDueToOrder() throws Exception {
-    CacheKey key1 = new CacheKey(new Object[]{1, "hello", null});
+    CacheKey key1 = new CacheKey(new Object[] { 1, "hello", null });
     Thread.sleep(1000);
-    CacheKey key2 = new CacheKey(new Object[]{1, null, "hello"});
+    CacheKey key2 = new CacheKey(new Object[] { 1, null, "hello" });
     assertFalse(key1.equals(key2));
     assertFalse(key2.equals(key1));
     assertFalse(key1.hashCode() == key2.hashCode());
@@ -71,4 +71,13 @@ public void shouldDemonstrateEmptyAndNullKeysAreEqual() {
     assertEquals(key2, key1);
   }
 
+  @Test
+  public void shouldTestCacheKeysWithBinaryArrays() throws Exception {
+    byte[] array1 = new byte[] { 1 };
+    byte[] array2 = new byte[] { 1 };
+    CacheKey key1 = new CacheKey(new Object[] { array1 });
+    CacheKey key2 = new CacheKey(new Object[] { array2 });
+    assertTrue(key1.equals(key2));
+  }
+
 }