From 460a7ace1c3bd0d66914a0e32764a67bf24210d1 Mon Sep 17 00:00:00 2001 From: Sanne Grinovero Date: Fri, 2 Oct 2009 20:19:22 +0000 Subject: [PATCH] HHH-4441 : fixing out-of-specification custom Serialization (see also JBMAR-67) git-svn-id: https://svn.jboss.org/repos/hibernate/core/trunk@17612 1b8cb986-b30d-0410-93ca-fae66ebed9b2 --- core/src/main/java/org/hibernate/impl/SessionImpl.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/core/src/main/java/org/hibernate/impl/SessionImpl.java b/core/src/main/java/org/hibernate/impl/SessionImpl.java index a43e1892d7..720465cc63 100644 --- a/core/src/main/java/org/hibernate/impl/SessionImpl.java +++ b/core/src/main/java/org/hibernate/impl/SessionImpl.java @@ -173,7 +173,7 @@ public final class SessionImpl extends AbstractSessionImpl private transient Session rootSession; private transient Map childSessionsByEntityMode; - private EntityNameResolver entityNameResolver = new CoordinatingEntityNameResolver(); + private transient EntityNameResolver entityNameResolver = new CoordinatingEntityNameResolver(); /** * Constructor used in building "child sessions". @@ -1918,6 +1918,8 @@ public final class SessionImpl extends AbstractSessionImpl private void readObject(ObjectInputStream ois) throws IOException, ClassNotFoundException { log.trace( "deserializing session" ); + ois.defaultReadObject(); + entityNameResolver = new CoordinatingEntityNameResolver(); boolean isRootSession = ois.readBoolean(); @@ -1972,6 +1974,8 @@ public final class SessionImpl extends AbstractSessionImpl log.trace( "serializing session" ); + oos.defaultWriteObject(); + oos.writeBoolean( rootSession == null ); oos.writeObject( connectionReleaseMode.toString() ); oos.writeObject( entityMode.toString() );