[hibernate-commits] Hibernate SVN: r17612 - core/trunk/core/src/main/java/org/hibernate/impl.

[hibernate-commits at lists.jboss.org]

Author: sannegrinovero
Date: 2009-10-02 16:19:22 -0400 (Fri, 02 Oct 2009)
New Revision: 17612

Modified:
   core/trunk/core/src/main/java/org/hibernate/impl/SessionImpl.java
Log:
HHH-4441 : fixing out-of-specification custom Serialization (see also JBMAR-67)

Modified: core/trunk/core/src/main/java/org/hibernate/impl/SessionImpl.java
===================================================================
--- core/trunk/core/src/main/java/org/hibernate/impl/SessionImpl.java	2009-10-02 10:38:45 UTC (rev 17611)
+++ core/trunk/core/src/main/java/org/hibernate/impl/SessionImpl.java	2009-10-02 20:19:22 UTC (rev 17612)
@@ -173,7 +173,7 @@
 	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 @@
 	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 @@
 
 		log.trace( "serializing session" );
 
+		oos.defaultWriteObject();
+
 		oos.writeBoolean( rootSession == null );
 		oos.writeObject( connectionReleaseMode.toString() );
 		oos.writeObject( entityMode.toString() );