From 97dd7f811757f42732b246149948092cfdcfe6c7 Mon Sep 17 00:00:00 2001
From: Johann Werner <jw@oyosys.de>
Date: Wed, 19 Aug 2015 16:29:11 +0200
Subject: [PATCH] return constant for empty results

---
 .../er/extensions/eof/ERXEOGlobalIDUtilities.java        | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/Frameworks/Core/ERExtensions/Sources/er/extensions/eof/ERXEOGlobalIDUtilities.java b/Frameworks/Core/ERExtensions/Sources/er/extensions/eof/ERXEOGlobalIDUtilities.java
index 579bb4fb6e8..6c863f5ee7e 100644
--- a/Frameworks/Core/ERExtensions/Sources/er/extensions/eof/ERXEOGlobalIDUtilities.java
+++ b/Frameworks/Core/ERExtensions/Sources/er/extensions/eof/ERXEOGlobalIDUtilities.java
@@ -160,6 +160,9 @@ public static NSDictionary<String, NSArray<EOGlobalID>> globalIDsGroupedByEntity
      * @param globalIDs
      */
     public static NSArray<Object> primaryKeyValuesWithGlobalIDs(NSArray<EOGlobalID> globalIDs) {
+    	if (globalIDs == null || globalIDs.count() == 0) {
+    		return NSArray.emptyArray();
+    	}
     	NSMutableArray<Object> result = new NSMutableArray<Object>(globalIDs.count());
     	NSDictionary<String, NSArray<EOGlobalID>> gidsByEntity = globalIDsGroupedByEntityName(globalIDs);
     	for (String entityName : gidsByEntity.keySet()) {
@@ -186,6 +189,9 @@ public static NSArray<Object> primaryKeyValuesWithGlobalIDs(NSArray<EOGlobalID>
      * @param values
      */
     public static NSArray<EOGlobalID> globalIDsWithPrimaryKeyValues(String entityName, NSArray<Object> values) {
+        if (values == null || values.count() == 0) {
+            return NSArray.emptyArray();
+        }
         NSMutableArray<EOGlobalID> result = new NSMutableArray<EOGlobalID>(values.count());
         for (Object value : values) {
             EOKeyGlobalID gid = EOKeyGlobalID.globalIDWithEntityName(entityName, new Object[] {value});
@@ -299,6 +305,9 @@ public static NSMutableArray<EOEnterpriseObject> fetchObjectsWithGlobalIDs(EOEdi
      * @param prefetchingKeypaths
      */
     public static NSArray<EOEnterpriseObject> fireFaultsForGlobalIDs(EOEditingContext ec, NSArray<EOGlobalID> globalIDs, NSArray<String> prefetchingKeypaths) {
+    	if (globalIDs == null || globalIDs.count() == 0) {
+    		return NSArray.emptyArray();
+    	}
     	NSMutableArray<EOEnterpriseObject> result = new NSMutableArray<EOEnterpriseObject>(globalIDs.count());
     	NSMutableArray<EOGlobalID> faults = new NSMutableArray<EOGlobalID>(globalIDs.count());
     	for (EOGlobalID gid : globalIDs) {