232881 - check for null attribute name since this is possible in an orm.xml file

1 files changed, 7 insertions, 1 deletions

diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmPersistentType.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmPersistentType.java
index 492b2db3bb..dc7054e620 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmPersistentType.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmPersistentType.java
@@ -261,7 +261,13 @@ public class GenericOrmPersistentType extends AbstractOrmJpaContextNode implemen
 		return new FilteringIterator<OrmPersistentAttribute, OrmPersistentAttribute>(attributes()) {
 			@Override
 			protected boolean accept(OrmPersistentAttribute o) {
-				return attributeName.equals(o.getName());
+				if (attributeName == null && o.getName() == null) {
+					return true;
+				}
+				if (attributeName != null && attributeName.equals(o.getName())) {
+					return true;
+				}
+				return false;
 			}
 		};
 	}