From e472a2ffd4c949ca3a798c9df00cbe2299953564 Mon Sep 17 00:00:00 2001
From: nicholas <woodward.nicholas@gmail.com>
Date: Fri, 5 Apr 2019 10:29:09 -0500
Subject: [PATCH 1/2] added check for null items iterator before concatenation

---
 .../src/main/java/org/dspace/app/bulkedit/MetadataExport.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/dspace-api/src/main/java/org/dspace/app/bulkedit/MetadataExport.java b/dspace-api/src/main/java/org/dspace/app/bulkedit/MetadataExport.java
index 9765511fb0..5d201c4a51 100644
--- a/dspace-api/src/main/java/org/dspace/app/bulkedit/MetadataExport.java
+++ b/dspace-api/src/main/java/org/dspace/app/bulkedit/MetadataExport.java
@@ -122,7 +122,9 @@ public class MetadataExport
                 System.out.print(" ");
             }
             Iterator<Item> items = buildFromCommunity(context, subCommunity, indent + 1);
-            result = addItemsToResult(result,items);
+            if (items != null) {
+                result = addItemsToResult(result,items);
+            }
         }
 
         return result;

From 379715f23346169e30e5675233f94d81af4967af Mon Sep 17 00:00:00 2001
From: nicholas <woodward.nicholas@gmail.com>
Date: Mon, 8 Apr 2019 11:16:45 -0500
Subject: [PATCH 2/2] removed null check; set result to empty iterator instead

---
 .../main/java/org/dspace/app/bulkedit/MetadataExport.java  | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/dspace-api/src/main/java/org/dspace/app/bulkedit/MetadataExport.java b/dspace-api/src/main/java/org/dspace/app/bulkedit/MetadataExport.java
index 5d201c4a51..4ee4bc92ff 100644
--- a/dspace-api/src/main/java/org/dspace/app/bulkedit/MetadataExport.java
+++ b/dspace-api/src/main/java/org/dspace/app/bulkedit/MetadataExport.java
@@ -18,6 +18,7 @@ import org.dspace.core.Context;
 import org.dspace.handle.factory.HandleServiceFactory;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.sql.SQLException;
 import java.util.Iterator;
 import java.util.List;
@@ -101,7 +102,7 @@ public class MetadataExport
     {
         // Add all the collections
         List<Collection> collections = community.getCollections();
-        Iterator<Item> result = null;
+        Iterator<Item> result = Collections.<Item>emptyIterator();
         for (Collection collection : collections)
         {
             for (int i = 0; i < indent; i++)
@@ -122,9 +123,7 @@ public class MetadataExport
                 System.out.print(" ");
             }
             Iterator<Item> items = buildFromCommunity(context, subCommunity, indent + 1);
-            if (items != null) {
-                result = addItemsToResult(result,items);
-            }
+            result = addItemsToResult(result,items);
         }
 
         return result;