Apache
/
commons-lang
mirror of https://github.com/apache/commons-lang.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

LANG-456: HashCodeBuilder throws StackOverflowError in bidirectional navigable 

association. Thanks to Bob Fields who provides the inital patch. Thanks to
Woosan Ko who wrote the final patch. Thanks to Bruno P. Kinoshita who
updated the final patch so that it was easy to apply.
This commit is contained in:
Benedikt Ritter 2015-05-01 22:21:11 +02:00
parent 4796a0a792
commit b5749b4f54
3 changed files with 88 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/changes/changes.xml
View File

@ -22,6 +22,7 @@
<body>
<release version="3.5" date="tba" description="tba">
<action issue="LANG-456" type="fix" dev="britter" due-to="Bob Fields, Woosan Ko, Bruno P. Kinoshita">HashCodeBuilder throws StackOverflowError in bidirectional navigable association</action>
<action issue="LANG-1126" type="fix" dev="britter">DateFormatUtilsTest.testSMTP depends on the default Locale</action>
<action issue="LANG-1123" type="fix" dev="chas" due-to="Christian P. Momon">Unit test FastDatePrinterTimeZonesTest needs a timezone set</action>
<action issue="LANG-916" type="fix" dev="chas" due-to="Christian P. Momon">CLONE - DateFormatUtils.format does not correctly change Calendar TimeZone in certain situations</action>

28
src/main/java/org/apache/commons/lang3/builder/HashCodeBuilder.java
View File

@ -856,7 +856,35 @@ public class HashCodeBuilder implements Builder<Integer> {
append((Object[]) object);
}
} else {
if (object instanceof Long) {
append(((Long) object).longValue());
} else if (object instanceof Integer) {
append(((Integer) object).intValue());
} else if (object instanceof Short) {
append(((Short) object).shortValue());
} else if (object instanceof Character) {
append(((Character) object).charValue());
} else if (object instanceof Byte) {
append(((Byte) object).byteValue());
} else if (object instanceof Double) {
append(((Double) object).doubleValue());
} else if (object instanceof Float) {
append(((Float) object).floatValue());
} else if (object instanceof Boolean) {
append(((Boolean) object).booleanValue());
} else if (object instanceof String) {
iTotal = iTotal * iConstant + object.hashCode();
} else {
if (isRegistered(object)) {
return this;
}
try {
register(object);
iTotal = iTotal * iConstant + object.hashCode();
} finally {
unregister(object);
}
}
}
}
return this;

59
src/test/java/org/apache/commons/lang3/builder/HashCodeBuilderTest.java
View File

@ -19,6 +19,7 @@ package org.apache.commons.lang3.builder;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
import org.junit.Test;
/**
@ -32,6 +33,8 @@ public class HashCodeBuilderTest {
* A reflection test fixture.
*/
static class ReflectionTestCycleA {
int index = 10;
String name = "ReflectionTestCycleA";
ReflectionTestCycleB b;
@Override
@ -44,6 +47,8 @@ public class HashCodeBuilderTest {
* A reflection test fixture.
*/
static class ReflectionTestCycleB {
int index = 11;
String name = "ReflectionTestCycleB";
ReflectionTestCycleA a;
@Override
@ -52,6 +57,42 @@ public class HashCodeBuilderTest {
}
}
/**
* A nonreflection test fixture.
*/
static class NonreflectionTestCycleA {
int index = 20;
String name = "NonreflectionTestCycleA";
NonreflectionTestCycleB b;
@Override
public int hashCode() {
HashCodeBuilder builder = new HashCodeBuilder();
builder.append(index);
builder.append(name);
builder.append(b);
return builder.toHashCode();
}
}
/**
* A nonreflection test fixture.
*/
static class NonreflectionTestCycleB {
int index = 21;
String name = "NonreflectionTestCycleB";
NonreflectionTestCycleA a;
@Override
public int hashCode() {
HashCodeBuilder builder = new HashCodeBuilder();
builder.append(index);
builder.append(name);
builder.append(a);
return builder.toHashCode();
}
}
// -----------------------------------------------------------------------
@Test(expected=IllegalArgumentException.class)
@ -523,7 +564,7 @@ public class HashCodeBuilderTest {
}
/**
* Test Objects pointing to each other.
* Test Objects pointing to each other when {@link HashCodeBuilder#reflectionHashCode(Object, String...)} used.
*/
@Test
public void testReflectionObjectCycle() {
@ -555,6 +596,22 @@ public class HashCodeBuilderTest {
assertNull(HashCodeBuilder.getRegistry());
}
/**
* Test Objects pointing to each other when <code>append()</code> methods are used on <code>HashCodeBuilder</code> instance.
*/
@Test
public void testNonreflectionObjectCycle() {
final NonreflectionTestCycleA a = new NonreflectionTestCycleA();
final NonreflectionTestCycleB b = new NonreflectionTestCycleB();
a.b = b;
b.a = a;
a.hashCode();
assertNull(HashCodeBuilder.getRegistry());
b.hashCode();
assertNull(HashCodeBuilder.getRegistry());
}
/**
* Ensures LANG-520 remains true
*/