Hibernate
/
hibernate-orm
mirror of https://github.com/hibernate/hibernate-orm
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

HHH-5195 : FilterImpl.validate() throws NullPointerException on deserialization 

git-svn-id: https://svn.jboss.org/repos/hibernate/core/trunk@19728 1b8cb986-b30d-0410-93ca-fae66ebed9b2
This commit is contained in:
Gail Badner 2010-06-15 02:15:54 +00:00
parent 182ee2f34e
commit 3c57a05313
2 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
core/src/main/java/org/hibernate/engine/LoadQueryInfluencers.java
View File

@ -111,6 +111,14 @@ public class LoadQueryInfluencers implements Serializable {
return enabledFilters;
}
/**
* Returns an unmodifiable Set of enabled filter names.
* @return an unmodifiable Set of enabled filter names.
*/
public Set getEnabledFilterNames() {
return java.util.Collections.unmodifiableSet( enabledFilters.keySet() );
}
public Filter getEnabledFilter(String filterName) {
return ( Filter ) enabledFilters.get( filterName );
}

11
core/src/main/java/org/hibernate/impl/SessionImpl.java
View File

@ -2150,9 +2150,16 @@ public final class SessionImpl extends AbstractSessionImpl
childSessionsByEntityMode = ( Map ) ois.readObject();
Iterator iter = loadQueryInfluencers.getEnabledFilters().values().iterator();
// 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.
Iterator iter = loadQueryInfluencers.getEnabledFilterNames().iterator();
while ( iter.hasNext() ) {
( ( FilterImpl ) iter.next() ).afterDeserialize( factory );
String filterName = ( String ) iter.next();
FilterImpl filter = ( FilterImpl ) loadQueryInfluencers.getEnabledFilter( filterName );
filter.afterDeserialize( factory );
filter.validate();
}
if ( isRootSession && childSessionsByEntityMode != null ) {