Skip to content

Problem with 'equals()' in CacheKey #124

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
ekravchenko wants to merge 2 commits into from
Closed

Problem with 'equals()' in CacheKey #124

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9a886b3
Added test that shows a problem with 'equals()' method when array is…
ekravchenko Jan 14, 2014
57a5671
Changed hashCode/equals to work well with arrays (Issue# 125)
ekravchenko Jan 14, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@
<findbugs.onlyAnalyze>org.apache.ibatis.*</findbugs.onlyAnalyze>
<clirr.comparisonVersion>3.1.1</clirr.comparisonVersion>
<osgi.export>org.apache.ibatis.*;version=${project.version};-noimport:=true</osgi.export>
<osgi.import>!ognl,net.sf.cglib.*;resolution:=optional,javassist.*;resolution:=optional,org.apache.commons.logging.*;resolution:=optional,org.apache.log4j.*;resolution:=optional,org.slf4j.*;resolution:=optional,org.apache.logging.log4j.*;resolution:=optional,*</osgi.import>
<osgi.import>org.apache.commons.lang3.builder;version="3.2.1",!ognl,net.sf.cglib.*;resolution:=optional,javassist.*;resolution:=optional,org.apache.commons.logging.*;resolution:=optional,org.apache.log4j.*;resolution:=optional,org.slf4j.*;resolution:=optional,org.apache.logging.log4j.*;resolution:=optional,*</osgi.import>
<osgi.dynamicImport>*</osgi.dynamicImport>
<javac.src.version>1.6</javac.src.version>
<javac.target.version>1.6</javac.target.version>
Expand Down Expand Up @@ -172,6 +172,11 @@
<version>1.1.1</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.2.1</version>
</dependency>
<dependency>
<groupId>org.javassist</groupId>
<artifactId>javassist</artifactId>
Expand Down
15 changes: 10 additions & 5 deletions src/main/java/org/apache/ibatis/cache/CacheKey.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@
*/
package org.apache.ibatis.cache;

import org.apache.commons.lang3.builder.EqualsBuilder;
import org.apache.commons.lang3.builder.HashCodeBuilder;

import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
Expand Down Expand Up @@ -51,7 +54,7 @@ public int getUpdateCount() {
}

public void update(Object object) {
int baseHashCode = object == null ? 1 : object.hashCode();
int baseHashCode = new HashCodeBuilder().append(object).toHashCode();

count++;
checksum += baseHashCode;
Expand Down Expand Up @@ -81,10 +84,12 @@ public boolean equals(Object object) {
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;
} else {
if (!thisObject.equals(thatObject)) return false;

EqualsBuilder equalsBuilder = new EqualsBuilder();
equalsBuilder.append(thisObject, thatObject);

if (!equalsBuilder.isEquals()) {
return false;
}
}
return true;
Expand Down
8 changes: 8 additions & 0 deletions src/test/java/org/apache/ibatis/cache/CacheKeyTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,4 +71,12 @@ 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));
}
}