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

[COLLECTIONS-576] Fix de-serialization of MultiKey subclasses: hashcode was not re-calculated. Thanks to Stephan Roch. 

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/collections/trunk@1705620 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Thomas Neidhart 2015-09-28 08:53:44 +00:00
parent 3a9c4718ee
commit f8bd75d37c
3 changed files with 42 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/changes/changes.xml
View File

@ -22,6 +22,9 @@
<body> <body>
<release version="4.1" date="TBD" description=""> <release version="4.1" date="TBD" description="">
<action issue="COLLECTIONS-576" dev="tn" type="fix" due-to="Stephan Roch">
Subclasses of MultiKey did not re-calculate their hashcode after de-serialization.
</action>
<action issue="COLLECTIONS-572" dev="tn" type="add"> <action issue="COLLECTIONS-572" dev="tn" type="add">
Added set operations to "SetUtils": union, difference, intersection and disjunction. Added set operations to "SetUtils": union, difference, intersection and disjunction.
The operations return a view of the result that is backed by the input sets. The operations return a view of the result that is backed by the input sets.

2
src/main/java/org/apache/commons/collections4/keyvalue/MultiKey.java
View File

@ -274,7 +274,7 @@ public class MultiKey<K> implements Serializable {
* only stable for the same process). * only stable for the same process).
* @return the instance with recalculated hash code * @return the instance with recalculated hash code
*/ */
private Object readResolve() { protected Object readResolve() {
calculateHashCode(keys); calculateHashCode(keys);
return this; return this;
} }

38
src/test/java/org/apache/commons/collections4/keyvalue/MultiKeyTest.java
View File

@ -254,4 +254,42 @@ public class MultiKeyTest extends TestCase {
final MultiKey<?> mk2 = new MultiKey<Object>(ONE, sysKey); final MultiKey<?> mk2 = new MultiKey<Object>(ONE, sysKey);
assertEquals(TWO, map2.get(mk2)); assertEquals(TWO, map2.get(mk2));
} }
static class DerivedMultiKey<T> extends MultiKey<T> {
private static final long serialVersionUID = 1928896152249821416L;
public DerivedMultiKey(T key1, T key2) {
super(key1, key2);
}
public T getFirst() {
return getKey(0);
}
public T getSecond() {
return getKey(1);
}
}
public void testEqualsAfterSerializationOfDerivedClass() throws IOException, ClassNotFoundException
{
final DerivedMultiKey<?> mk = new DerivedMultiKey<String>("A", "B");
// serialize
final ByteArrayOutputStream baos = new ByteArrayOutputStream();
final ObjectOutputStream out = new ObjectOutputStream(baos);
out.writeObject(mk);
out.close();
// deserialize
final ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray());
final ObjectInputStream in = new ObjectInputStream(bais);
final DerivedMultiKey<?> mk2 = (DerivedMultiKey<?>)in.readObject();
in.close();
assertEquals(mk.hashCode(), mk2.hashCode());
}
} }