From f498f573818da0ac93be47eb11c3598f24744ef4 Mon Sep 17 00:00:00 2001
From: jvergara <jvergara@localhost>
Date: Fri, 17 Nov 2006 17:40:50 +0000
Subject: [PATCH] The modifications basically do the following:

---
 opendj-sdk/opends/src/server/org/opends/server/tools/ImportLDIF.java |   36 ++++++++++++++++++++++--------------
 1 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/opendj-sdk/opends/src/server/org/opends/server/tools/ImportLDIF.java b/opendj-sdk/opends/src/server/org/opends/server/tools/ImportLDIF.java
index 33a3790..640b269 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/tools/ImportLDIF.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/tools/ImportLDIF.java
@@ -662,8 +662,12 @@
 
     ArrayList<Backend>     backendList = new ArrayList<Backend>();
     ArrayList<ConfigEntry> entryList   = new ArrayList<ConfigEntry>();
-    ArrayList<List<DN>>    dnList      = new ArrayList<List<DN>>();
-    getBackends(backendList, entryList, dnList);
+    ArrayList<List<DN>> dnList = new ArrayList<List<DN>>();
+    int code = getBackends(backendList, entryList, dnList);
+    if (code != 0)
+    {
+      return code;
+    }
 
     int numBackends = backendList.size();
     for (int i=0; i < numBackends; i++)
@@ -1000,8 +1004,11 @@
    *                      the backends will be placed.
    * @param  dnList       A list into which the set of base DNs for each backend
    *                      will be placed.
+   *
+   * @return 0 if everything went fine. 1 if an error occurred.
+   *
    */
-  private static void getBackends(ArrayList<Backend> backendList,
+  private static int getBackends(ArrayList<Backend> backendList,
                                   ArrayList<ConfigEntry> entryList,
                                   ArrayList<List<DN>> dnList)
   {
@@ -1017,7 +1024,7 @@
       String message = getMessage(msgID, DN_BACKEND_BASE, de.getErrorMessage());
       logError(ErrorLogCategory.BACKEND, ErrorLogSeverity.SEVERE_ERROR, message,
                msgID);
-      System.exit(1);
+      return 1;
     }
     catch (Exception e)
     {
@@ -1026,7 +1033,7 @@
                                   stackTraceToSingleLineString(e));
       logError(ErrorLogCategory.BACKEND, ErrorLogSeverity.SEVERE_ERROR, message,
                msgID);
-      System.exit(1);
+      return 1;
     }
 
     ConfigEntry baseEntry = null;
@@ -1040,7 +1047,7 @@
       String message = getMessage(msgID, DN_BACKEND_BASE, ce.getMessage());
       logError(ErrorLogCategory.BACKEND, ErrorLogSeverity.SEVERE_ERROR, message,
                msgID);
-      System.exit(1);
+      return 1;
     }
     catch (Exception e)
     {
@@ -1049,7 +1056,7 @@
                                   stackTraceToSingleLineString(e));
       logError(ErrorLogCategory.BACKEND, ErrorLogSeverity.SEVERE_ERROR, message,
                msgID);
-      System.exit(1);
+      return 1;
     }
 
 
@@ -1084,7 +1091,7 @@
                                     ce.getMessage());
         logError(ErrorLogCategory.BACKEND, ErrorLogSeverity.SEVERE_ERROR,
                  message, msgID);
-        System.exit(1);
+        return 1;
       }
       catch (Exception e)
       {
@@ -1093,7 +1100,7 @@
                                     stackTraceToSingleLineString(e));
         logError(ErrorLogCategory.BACKEND, ErrorLogSeverity.SEVERE_ERROR,
                  message, msgID);
-        System.exit(1);
+        return 1;
       }
 
 
@@ -1124,7 +1131,7 @@
                                     ce.getMessage());
         logError(ErrorLogCategory.BACKEND, ErrorLogSeverity.SEVERE_ERROR,
                  message, msgID);
-        System.exit(1);
+        return 1;
       }
       catch (Exception e)
       {
@@ -1133,7 +1140,7 @@
                                     stackTraceToSingleLineString(e));
         logError(ErrorLogCategory.BACKEND, ErrorLogSeverity.SEVERE_ERROR,
                  message, msgID);
-        System.exit(1);
+        return 1;
       }
 
       Class backendClass = null;
@@ -1149,7 +1156,7 @@
                                     stackTraceToSingleLineString(e));
         logError(ErrorLogCategory.BACKEND, ErrorLogSeverity.SEVERE_ERROR,
                  message, msgID);
-        System.exit(1);
+        return 1;
       }
 
       Backend backend = null;
@@ -1166,7 +1173,7 @@
                                     stackTraceToSingleLineString(e));
         logError(ErrorLogCategory.BACKEND, ErrorLogSeverity.SEVERE_ERROR,
                  message, msgID);
-        System.exit(1);
+        return 1;
       }
 
 
@@ -1201,7 +1208,7 @@
                                     stackTraceToSingleLineString(e));
         logError(ErrorLogCategory.BACKEND, ErrorLogSeverity.SEVERE_ERROR,
                  message, msgID);
-        System.exit(1);
+        return 1;
       }
 
 
@@ -1209,6 +1216,7 @@
       entryList.add(configEntry);
       dnList.add(baseDNs);
     }
+    return 0;
   }
 }
 

--
Gitblit v1.10.0