Permalink
Browse files

HHH-9024 correct TypedValue transients during de-serialization

  • Loading branch information...
1 parent 2f293ed commit ca0c2f45487f0e39f079c1894a2909c4c90d816d @brmeyer brmeyer committed Mar 6, 2014
@@ -23,6 +23,8 @@
*/
package org.hibernate.engine.spi;
+import java.io.IOException;
+import java.io.ObjectInputStream;
import java.io.Serializable;
import org.hibernate.EntityMode;
@@ -39,19 +41,12 @@
private final Type type;
private final Object value;
// "transient" is important here -- NaturalIdCacheKey needs to be Serializable
- private final transient ValueHolder<Integer> hashcode;
+ private transient ValueHolder<Integer> hashcode;
public TypedValue(final Type type, final Object value) {
this.type = type;
this.value = value;
- this.hashcode = new ValueHolder<Integer>(
- new ValueHolder.DeferredInitializer<Integer>() {
- @Override
- public Integer initialize() {
- return value == null ? 0 : type.getHashCode( value );
- }
- }
- );
+ initTransients();
}
/**
@@ -90,9 +85,18 @@ public boolean equals(Object other) {
&& type.isEqual( that.value, value );
}
-}
-
-
-
-
+ private void readObject(ObjectInputStream ois)
+ throws ClassNotFoundException, IOException {
+ ois.defaultReadObject();
+ initTransients();
+ }
+ private void initTransients() {
+ this.hashcode = new ValueHolder<Integer>( new ValueHolder.DeferredInitializer<Integer>() {
+ @Override
+ public Integer initialize() {
+ return value == null ? 0 : type.getHashCode( value );
+ }
+ } );
+ }
+}
@@ -0,0 +1,60 @@
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * JBoss, Home of Professional Open Source
+ * Copyright 2014 Red Hat Inc. and/or its affiliates and other contributors
+ * as indicated by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ */
+package org.hibernate.test.serialization;
+
+import static org.junit.Assert.assertEquals;
+import static org.mockito.Mockito.mock;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+
+import org.hibernate.engine.spi.TypedValue;
+import org.hibernate.testing.TestForIssue;
+import org.hibernate.type.Type;
+import org.junit.Test;
+
+/**
+ * @author Brett Meyer
+ */
+public class TypedValueSerializationTest {
+
+ @Test
+ @TestForIssue(jiraKey = "HHH-9024")
+ public void testTypedValueSerialization() throws Exception {
+ final Type mockType = mock(Type.class);
+ final String value = "foo";
+ final TypedValue typedValue = new TypedValue(mockType, value);
+
+ final ByteArrayOutputStream baos = new ByteArrayOutputStream();
+ final ObjectOutputStream oos = new ObjectOutputStream(baos);
+ oos.writeObject(typedValue);
+
+ final ObjectInputStream ois = new ObjectInputStream(new ByteArrayInputStream(baos.toByteArray()));
+ final TypedValue typedValueClone = (TypedValue) ois.readObject();
+
+ assertEquals(typedValue.hashCode(), typedValueClone.hashCode());
+ assertEquals(typedValue.toString(), typedValueClone.toString());
+ assertEquals(typedValue.getValue(), typedValueClone.getValue());
+ }
+
+}

0 comments on commit ca0c2f4

Please sign in to comment.