Merge pull request #779 from maiksd/fix_npe_in_uuid_pk

Fix critical NPE in UUID primary key generation code
wocommunity · Jun 30, 2016 · 377720d · 377720d
2 parents 5feab46 + 12525c2
commit 377720d
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/Frameworks/Core/ERExtensions/Sources/er/extensions/eof/ERXGenericRecord.java b/Frameworks/Core/ERExtensions/Sources/er/extensions/eof/ERXGenericRecord.java
@@ -776,7 +776,8 @@ public NSDictionary<String, Object> rawPrimaryKeyDictionary(boolean inTransactio
 	private NSDictionary<String, Object> createUuidPrimaryKey(NSArray<EOAttribute> primaryKeyAttributes) {
 		if (primaryKeyAttributes.count() == 1) {
 			EOAttribute primaryKeyAttribute = primaryKeyAttributes.objectAtIndex(0);			
-			if (primaryKeyAttribute.prototypeName().equals(uuidPrototypeName)) {
+			String prototypeName = primaryKeyAttribute.prototypeName();
+			if (prototypeName != null && prototypeName.equals(uuidPrototypeName)) {
 				return new NSDictionary<String, Object>(UUIDUtilities.generateAsNSData(), primaryKeyAttribute.name());
 			}
 		}