From d1a540a2f1110c7af8a92b940762b35cdd0ff7f0 Mon Sep 17 00:00:00 2001
From: Peter Dietz <peter@longsight.com>
Date: Mon, 20 Oct 2014 17:55:16 -0400
Subject: [PATCH] Fix rebase, since mapOut is a static

---
 .../org/dspace/app/itemimport/ItemImport.java  | 18 +++---------------
 1 file changed, 3 insertions(+), 15 deletions(-)

diff --git a/dspace-api/src/main/java/org/dspace/app/itemimport/ItemImport.java b/dspace-api/src/main/java/org/dspace/app/itemimport/ItemImport.java
index c0dede04cc..e00beafa25 100644
--- a/dspace-api/src/main/java/org/dspace/app/itemimport/ItemImport.java
+++ b/dspace-api/src/main/java/org/dspace/app/itemimport/ItemImport.java
@@ -43,17 +43,8 @@ import org.apache.xpath.XPathAPI;
 import org.dspace.authorize.AuthorizeException;
 import org.dspace.authorize.AuthorizeManager;
 import org.dspace.authorize.ResourcePolicy;
-import org.dspace.content.Bitstream;
-import org.dspace.content.BitstreamFormat;
-import org.dspace.content.Bundle;
+import org.dspace.content.*;
 import org.dspace.content.Collection;
-import org.dspace.content.FormatIdentifier;
-import org.dspace.content.InstallItem;
-import org.dspace.content.Item;
-import org.dspace.content.ItemIterator;
-import org.dspace.content.MetadataField;
-import org.dspace.content.MetadataSchema;
-import org.dspace.content.WorkspaceItem;
 import org.dspace.core.ConfigurationManager;
 import org.dspace.core.Constants;
 import org.dspace.core.Context;
@@ -106,6 +97,8 @@ public class ItemImport
 
     private static boolean template = false;
 
+    private static PrintWriter mapOut = null;
+
     private static final String tempWorkDir = ConfigurationManager.getProperty("org.dspace.app.batchitemimport.work.dir");
 
     static {
@@ -668,7 +661,6 @@ public class ItemImport
     {
         // create the mapfile
         File outFile = null;
-        PrintWriter mapOut = null;
 
         try {
             Map<String, String> skipItems = new HashMap<String, String>(); // set of items to skip if in 'resume'
@@ -677,10 +669,6 @@ public class ItemImport
             System.out.println("Adding items from directory: " + sourceDir);
             System.out.println("Generating mapfile: " + mapFile);
 
-        // create the mapfile
-        File outFile = null;
-        PrintWriter mapOut = null;
-
         boolean directoryFileCollections = false;
         if (mycollections == null)
         {