[hibernate-commits] Hibernate SVN: r11221 - branches/Branch_3_2/HibernateExt/annotations/src/java/org/hibernate/cfg/annotations.
Author: epbernard
Date: 2007-02-20 14:33:02 -0500 (Tue, 20 Feb 2007)
New Revision: 11221
Modified:
branches/Branch_3_2/HibernateExt/annotations/src/java/org/hibernate/cfg/annotations/EntityBinder.java
Log:
ANN-559 filter unknown leads to NPEs
Modified:
branches/Branch_3_2/HibernateExt/annotations/src/java/org/hibernate/cfg/annotations/EntityBinder.java
===================================================================
---
branches/Branch_3_2/HibernateExt/annotations/src/java/org/hibernate/cfg/annotations/EntityBinder.java 2007-02-20
19:29:20 UTC (rev 11220)
+++
branches/Branch_3_2/HibernateExt/annotations/src/java/org/hibernate/cfg/annotations/EntityBinder.java 2007-02-20
19:33:02 UTC (rev 11221)
@@ -48,6 +48,7 @@
import org.hibernate.cfg.PropertyHolder;
import org.hibernate.engine.Versioning;
import org.hibernate.engine.ExecuteUpdateResultCheckStyle;
+import org.hibernate.engine.FilterDefinition;
import org.hibernate.mapping.DependantValue;
import org.hibernate.mapping.Join;
import org.hibernate.mapping.PersistentClass;
@@ -260,7 +261,8 @@
String filterName = filter.getKey();
String cond = filter.getValue();
if ( BinderHelper.isDefault( cond ) ) {
- cond = mappings.getFilterDefinition( filterName ).getDefaultFilterCondition();
+ FilterDefinition definition = mappings.getFilterDefinition( filterName );
+ cond = definition == null ? null : definition.getDefaultFilterCondition();
if ( StringHelper.isEmpty( cond ) ) {
throw new AnnotationException(
"no filter condition found for filter " + filterName + " in "
+ this.name