[hibernate-commits] Hibernate SVN: r20158 - core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/impl.

[hibernate-commits at lists.jboss.org]

Author: stliu
Date: 2010-08-18 06:21:12 -0400 (Wed, 18 Aug 2010)
New Revision: 20158

Modified:
   core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/impl/SessionImpl.java
Log:
JBPAPP-4904 HHH-4441 SessionImpl serialization violates java serialization spec

Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/impl/SessionImpl.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/impl/SessionImpl.java	2010-08-17 18:23:03 UTC (rev 20157)
+++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/impl/SessionImpl.java	2010-08-18 10:21:12 UTC (rev 20158)
@@ -174,7 +174,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".
@@ -1899,7 +1899,7 @@
 	 */
 	private void readObject(ObjectInputStream ois) throws IOException, ClassNotFoundException {
 		log.trace( "deserializing session" );
-
+		ois.defaultReadObject();
 		entityNameResolver = new CoordinatingEntityNameResolver();
 
 		boolean isRootSession = ois.readBoolean();
@@ -1953,7 +1953,7 @@
 		}
 
 		log.trace( "serializing session" );
-
+		oos.defaultWriteObject();
 		oos.writeBoolean( rootSession == null );
 		oos.writeObject( connectionReleaseMode.toString() );
 		oos.writeObject( entityMode.toString() );