From 233c602bd96ad64060930507776e258018bea260 Mon Sep 17 00:00:00 2001
From: brmeyer <brmeyer@redhat.com>
Date: Wed, 14 Nov 2012 14:44:15 -0500
Subject: [PATCH] HHH-7702 Add support for collections of (aggregated)
 composite elements

---
 .../src/main/java/org/hibernate/metamodel/MetadataSources.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/MetadataSources.java b/hibernate-core/src/main/java/org/hibernate/metamodel/MetadataSources.java
index 45151cced1..373634667c 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/MetadataSources.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/MetadataSources.java
@@ -528,7 +528,8 @@ private void indexClass(Class clazz, Indexer indexer, Set<Class<?>> processedCla
 			if ( fieldClass.isArray() ) {
 				fieldClass = fieldClass.getComponentType();
 			}
-			else if ( Collection.class.isAssignableFrom( fieldClass ) ) {
+			else if ( Collection.class.isAssignableFrom( fieldClass )
+					&& declaredField.getGenericType() instanceof ParameterizedType ) {
 				ParameterizedType listType = (ParameterizedType) declaredField.getGenericType();
 				fieldClass = (Class<?>) listType.getActualTypeArguments()[0];
 		    }