[hibernate-commits] Hibernate SVN: r20027 - core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/path.
hibernate-commits at lists.jboss.org
hibernate-commits at lists.jboss.org
Fri Jul 23 13:35:55 EDT 2010
Author: steve.ebersole at jboss.com
Date: 2010-07-23 13:35:55 -0400 (Fri, 23 Jul 2010)
New Revision: 20027
Modified:
core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/path/AbstractFromImpl.java
Log:
HHH-5296 - AbstractFromImpl::getJoin() shall return empty set, not null
Modified: core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/path/AbstractFromImpl.java
===================================================================
--- core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/path/AbstractFromImpl.java 2010-07-23 17:34:57 UTC (rev 20026)
+++ core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/path/AbstractFromImpl.java 2010-07-23 17:35:55 UTC (rev 20027)
@@ -24,6 +24,7 @@
package org.hibernate.ejb.criteria.path;
import java.io.Serializable;
+import java.util.Collections;
import java.util.LinkedHashSet;
import java.util.Set;
import javax.persistence.criteria.CollectionJoin;
@@ -243,8 +244,11 @@
/**
* {@inheritDoc}
*/
+ @SuppressWarnings({ "unchecked" })
public Set<Join<X, ?>> getJoins() {
- return joins;
+ return joins == null
+ ? Collections.EMPTY_SET
+ : joins;
}
/**
@@ -575,8 +579,11 @@
/**
* {@inheritDoc}
*/
+ @SuppressWarnings({ "unchecked" })
public Set<Fetch<X, ?>> getFetches() {
- return fetches;
+ return fetches == null
+ ? Collections.EMPTY_SET
+ : fetches;
}
public <Y> Fetch<X, Y> fetch(SingularAttribute<? super X, Y> singularAttribute) {
More information about the hibernate-commits
mailing list