[hibernate-commits] Hibernate SVN: r19727 - core/trunk/testsuite/src/test/java/org/hibernate/test/connections.

[hibernate-commits at lists.jboss.org]

Author: gbadner
Date: 2010-06-14 22:15:05 -0400 (Mon, 14 Jun 2010)
New Revision: 19727

Modified:
   core/trunk/testsuite/src/test/java/org/hibernate/test/connections/ConnectionManagementTestCase.java
   core/trunk/testsuite/src/test/java/org/hibernate/test/connections/Silly.hbm.xml
Log:
HHH-5195 : FilterImpl.validate() throws NullPointerException on deserialization

Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/connections/ConnectionManagementTestCase.java
===================================================================
--- core/trunk/testsuite/src/test/java/org/hibernate/test/connections/ConnectionManagementTestCase.java	2010-06-14 18:59:10 UTC (rev 19726)
+++ core/trunk/testsuite/src/test/java/org/hibernate/test/connections/ConnectionManagementTestCase.java	2010-06-15 02:15:05 UTC (rev 19727)
@@ -130,6 +130,43 @@
 	}
 
 	/**
+	 * Tests to validate that a session holding JDBC resources will not
+	 * be allowed to serialize.
+	 */
+	public final void testEnabledFilterSerialization() throws Throwable {
+		prepare();
+		Session sessionUnderTest = getSessionUnderTest();
+
+		sessionUnderTest.enableFilter( "nameIsNull" );
+		assertNotNull( sessionUnderTest.getEnabledFilter( "nameIsNull" ) );
+		sessionUnderTest.disconnect();
+		assertNotNull( sessionUnderTest.getEnabledFilter( "nameIsNull" ) );
+
+		byte[] bytes = SerializationHelper.serialize( sessionUnderTest );
+		checkSerializedState( sessionUnderTest );
+		assertNotNull( sessionUnderTest.getEnabledFilter( "nameIsNull" ) );
+		reconnect( sessionUnderTest );
+		assertNotNull( sessionUnderTest.getEnabledFilter( "nameIsNull" ) );
+		sessionUnderTest.disconnect();
+		assertNotNull( sessionUnderTest.getEnabledFilter( "nameIsNull" ) );
+
+		Session s2 = ( Session ) SerializationHelper.deserialize( bytes );
+		checkDeserializedState( s2 );
+		assertNotNull( sessionUnderTest.getEnabledFilter( "nameIsNull" ) );
+		reconnect( s2 );
+		assertNotNull( sessionUnderTest.getEnabledFilter( "nameIsNull" ) );
+
+		s2.disconnect();
+		assertNotNull( sessionUnderTest.getEnabledFilter( "nameIsNull" ) );
+		reconnect( s2 );
+		assertNotNull( sessionUnderTest.getEnabledFilter( "nameIsNull" ) );
+
+		release( sessionUnderTest );
+		release( s2 );
+		done();
+	}
+
+	/**
 	 * Test that a session which has been manually disconnected will be allowed
 	 * to serialize.
 	 */

Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/connections/Silly.hbm.xml
===================================================================
--- core/trunk/testsuite/src/test/java/org/hibernate/test/connections/Silly.hbm.xml	2010-06-14 18:59:10 UTC (rev 19726)
+++ core/trunk/testsuite/src/test/java/org/hibernate/test/connections/Silly.hbm.xml	2010-06-15 02:15:05 UTC (rev 19727)
@@ -20,4 +20,6 @@
 		<property name="name"/>
 	</class>
 
+    <filter-def name="nameIsNull" condition="name is null" />
+
 </hibernate-mapping>
\ No newline at end of file