Author: gbadner
Date: 2010-06-14 22:45:35 -0400 (Mon, 14 Jun 2010)
New Revision: 19731
Modified:
core/branches/Branch_3_5/core/src/main/java/org/hibernate/impl/FilterImpl.java
core/branches/Branch_3_5/core/src/main/java/org/hibernate/impl/SessionImpl.java
Log:
HHH-5195 : FilterImpl.validate() throws NullPointerException on deserialization
Modified: core/branches/Branch_3_5/core/src/main/java/org/hibernate/impl/FilterImpl.java
===================================================================
---
core/branches/Branch_3_5/core/src/main/java/org/hibernate/impl/FilterImpl.java 2010-06-15
02:44:40 UTC (rev 19730)
+++
core/branches/Branch_3_5/core/src/main/java/org/hibernate/impl/FilterImpl.java 2010-06-15
02:45:35 UTC (rev 19731)
@@ -51,6 +51,7 @@
void afterDeserialize(SessionFactoryImpl factory) {
definition = factory.getFilterDefinition(filterName);
+ validate();
}
/**
Modified: core/branches/Branch_3_5/core/src/main/java/org/hibernate/impl/SessionImpl.java
===================================================================
---
core/branches/Branch_3_5/core/src/main/java/org/hibernate/impl/SessionImpl.java 2010-06-15
02:44:40 UTC (rev 19730)
+++
core/branches/Branch_3_5/core/src/main/java/org/hibernate/impl/SessionImpl.java 2010-06-15
02:45:35 UTC (rev 19731)
@@ -2143,14 +2143,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