From 28ba6776b29ea3d6d0dcb45eacf853c6bfb09142 Mon Sep 17 00:00:00 2001
From: coulbeck <coulbeck@localhost>
Date: Wed, 27 Sep 2006 16:11:33 +0000
Subject: [PATCH] Issue 729: import LDIF tool returns successful exit code on failure.
---
opendj-sdk/opends/src/server/org/opends/server/tools/ImportLDIF.java | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 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 09926b4..e3eafad 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
@@ -345,8 +345,8 @@
try
{
- directoryServer.bootstrapClient();
- directoryServer.initializeJMX();
+ DirectoryServer.bootstrapClient();
+ DirectoryServer.initializeJMX();
}
catch (Exception e)
{
@@ -914,7 +914,7 @@
String.valueOf(failureReason));
logError(ErrorLogCategory.BACKEND, ErrorLogSeverity.SEVERE_ERROR,
message, msgID);
- return 0;
+ return 1;
}
}
catch (Exception e)
@@ -924,11 +924,12 @@
stackTraceToSingleLineString(e));
logError(ErrorLogCategory.BACKEND, ErrorLogSeverity.SEVERE_ERROR,
message, msgID);
- return 0;
+ return 1;
}
// Launch the import.
+ int retCode = 0;
try
{
backend.importLDIF(configEntry, baseDNs, importConfig);
@@ -939,6 +940,7 @@
String message = getMessage(msgID, de.getErrorMessage());
logError(ErrorLogCategory.BACKEND, ErrorLogSeverity.SEVERE_ERROR, message,
msgID);
+ retCode = 1;
}
catch (Exception e)
{
@@ -946,6 +948,7 @@
String message = getMessage(msgID, stackTraceToSingleLineString(e));
logError(ErrorLogCategory.BACKEND, ErrorLogSeverity.SEVERE_ERROR, message,
msgID);
+ retCode = 1;
}
@@ -961,6 +964,7 @@
String.valueOf(failureReason));
logError(ErrorLogCategory.BACKEND, ErrorLogSeverity.SEVERE_WARNING,
message, msgID);
+ retCode = 1;
}
}
catch (Exception e)
@@ -970,12 +974,13 @@
stackTraceToSingleLineString(e));
logError(ErrorLogCategory.BACKEND, ErrorLogSeverity.SEVERE_WARNING,
message, msgID);
+ retCode = 1;
}
// Clean up after the import by closing the import config.
importConfig.close();
- return 0;
+ return retCode;
}
--
Gitblit v1.10.0