HHH-8261 missing null check of type definition parameters

hibernate · May 22, 2013 · 3e59f96 · 3e59f96
1 parent 390e72e
commit 3e59f96
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/hbm/Helper.java b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/hbm/Helper.java
@@ -261,7 +261,7 @@ public static Iterable<CascadeStyle> interpretCascadeStyles(String cascades, Loc
 
 	public static Map<String, String> extractParameters(List<JaxbParamElement> xmlParamElements) {
 		if ( xmlParamElements == null || xmlParamElements.isEmpty() ) {
-			return null;
+			return Collections.emptyMap();
 		}
 		final HashMap<String,String> params = new HashMap<String, String>();
 		for ( JaxbParamElement paramElement : xmlParamElements ) {

diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/spi/binding/TypeDefinition.java b/hibernate-core/src/main/java/org/hibernate/metamodel/spi/binding/TypeDefinition.java
@@ -46,7 +46,9 @@ public TypeDefinition(
 		this.name = name;
 		this.typeImplementorClass = typeImplementorClass;
 		this.registrationKeys= registrationKeys;
-		this.parameters = Collections.unmodifiableMap( parameters );
+		this.parameters = parameters == null ? Collections.<String, String>emptyMap() : Collections.unmodifiableMap(
+				parameters
+		);
 	}
 
 	public String getName() {

diff --git a/hibernate-core/src/test/java/org/hibernate/test/cut/CompositeUserTypeTest.java b/hibernate-core/src/test/java/org/hibernate/test/cut/CompositeUserTypeTest.java
@@ -44,7 +44,7 @@
 /**
  * @author Gavin King
  */
-@FailureExpectedWithNewMetamodel
+//@FailureExpectedWithNewMetamodel
 public class CompositeUserTypeTest extends BaseCoreFunctionalTestCase {
 	@Override
 	public String[] getMappings() {