Author: gbadner
Date: 2010-06-14 22:44:40 -0400 (Mon, 14 Jun 2010)
New Revision: 19730
Modified:
core/trunk/core/src/main/java/org/hibernate/impl/FilterImpl.java
core/trunk/core/src/main/java/org/hibernate/impl/SessionImpl.java
Log:
HHH-5195 : FilterImpl.validate() throws NullPointerException on deserialization
Modified: core/trunk/core/src/main/java/org/hibernate/impl/FilterImpl.java
===================================================================
--- core/trunk/core/src/main/java/org/hibernate/impl/FilterImpl.java 2010-06-15 02:22:31
UTC (rev 19729)
+++ core/trunk/core/src/main/java/org/hibernate/impl/FilterImpl.java 2010-06-15 02:44:40
UTC (rev 19730)
@@ -51,6 +51,7 @@
void afterDeserialize(SessionFactoryImpl factory) {
definition = factory.getFilterDefinition(filterName);
+ validate();
}
/**
Modified: core/trunk/core/src/main/java/org/hibernate/impl/SessionImpl.java
===================================================================
--- core/trunk/core/src/main/java/org/hibernate/impl/SessionImpl.java 2010-06-15 02:22:31
UTC (rev 19729)
+++ core/trunk/core/src/main/java/org/hibernate/impl/SessionImpl.java 2010-06-15 02:44:40
UTC (rev 19730)
@@ -2152,14 +2152,12 @@
// LoadQueryInfluencers.getEnabledFilters() tries to validate each enabled
// filter, which will fail when called before FilterImpl.afterDeserialize( factory );
- // Instead lookup the filter by name, call FilterImpl.afterDeserialize( factory ),
- // and then validate.
+ // Instead lookup the filter by name and then call FilterImpl.afterDeserialize( factory
).
Iterator iter = loadQueryInfluencers.getEnabledFilterNames().iterator();
while ( iter.hasNext() ) {
String filterName = ( String ) iter.next();
- FilterImpl filter = ( FilterImpl ) loadQueryInfluencers.getEnabledFilter( filterName
);
- filter.afterDeserialize( factory );
- filter.validate();
+ ( ( FilterImpl ) loadQueryInfluencers.getEnabledFilter( filterName ) )
+ .afterDeserialize( factory );
}
if ( isRootSession && childSessionsByEntityMode != null ) {
Show replies by date