From c888ad173543559089d2e0a93b6c1bfc8c1868dc Mon Sep 17 00:00:00 2001
From: neil_a_wilson <neil_a_wilson@localhost>
Date: Tue, 24 Apr 2007 22:40:57 +0000
Subject: [PATCH] Make several significant changes to the OpenDS code base, including:

---
 opendj-sdk/opends/src/server/org/opends/server/tools/ExportLDIF.java |   28 +++++++++++++---------------
 1 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/opendj-sdk/opends/src/server/org/opends/server/tools/ExportLDIF.java b/opendj-sdk/opends/src/server/org/opends/server/tools/ExportLDIF.java
index 9197a9b..139e229 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/tools/ExportLDIF.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/tools/ExportLDIF.java
@@ -309,7 +309,7 @@
       catch (Exception e)
       {
         int    msgID   = MSGID_SERVER_BOOTSTRAP_ERROR;
-        String message = getMessage(msgID, stackTraceToSingleLineString(e));
+        String message = getMessage(msgID, getExceptionMessage(e));
         System.err.println(wrapText(message, MAX_LINE_WIDTH));
         return 1;
       }
@@ -329,7 +329,7 @@
       catch (Exception e)
       {
         int    msgID   = MSGID_CANNOT_LOAD_CONFIG;
-        String message = getMessage(msgID, stackTraceToSingleLineString(e));
+        String message = getMessage(msgID, getExceptionMessage(e));
         System.err.println(wrapText(message, MAX_LINE_WIDTH));
         return 1;
       }
@@ -358,7 +358,7 @@
       catch (Exception e)
       {
         int    msgID   = MSGID_CANNOT_LOAD_SCHEMA;
-        String message = getMessage(msgID, stackTraceToSingleLineString(e));
+        String message = getMessage(msgID, getExceptionMessage(e));
         System.err.println(wrapText(message, MAX_LINE_WIDTH));
         return 1;
       }
@@ -387,7 +387,7 @@
       catch (Exception e)
       {
         int    msgID   = MSGID_CANNOT_INITIALIZE_CORE_CONFIG;
-        String message = getMessage(msgID, stackTraceToSingleLineString(e));
+        String message = getMessage(msgID, getExceptionMessage(e));
         System.err.println(wrapText(message, MAX_LINE_WIDTH));
         return 1;
       }
@@ -415,7 +415,7 @@
       catch (Exception e)
       {
         int    msgID   = MSGID_CANNOT_INITIALIZE_CRYPTO_MANAGER;
-        String message = getMessage(msgID, stackTraceToSingleLineString(e));
+        String message = getMessage(msgID, getExceptionMessage(e));
         System.err.println(wrapText(message, MAX_LINE_WIDTH));
         return 1;
       }
@@ -452,7 +452,7 @@
       catch (Exception e)
       {
         int    msgID   = MSGID_LDIFEXPORT_CANNOT_INITIALIZE_PLUGINS;
-        String message = getMessage(msgID, stackTraceToSingleLineString(e));
+        String message = getMessage(msgID, getExceptionMessage(e));
         System.err.println(wrapText(message, MAX_LINE_WIDTH));
         return 1;
       }
@@ -530,7 +530,7 @@
         {
           int    msgID   = MSGID_LDIFEXPORT_CANNOT_PARSE_EXCLUDE_FILTER;
           String message = getMessage(msgID, filterString,
-                                      stackTraceToSingleLineString(e));
+                                      getExceptionMessage(e));
           logError(ErrorLogCategory.BACKEND, ErrorLogSeverity.SEVERE_ERROR,
                    message, msgID);
           return 1;
@@ -565,7 +565,7 @@
         {
           int    msgID   = MSGID_LDIFEXPORT_CANNOT_PARSE_INCLUDE_FILTER;
           String message = getMessage(msgID, filterString,
-                                      stackTraceToSingleLineString(e));
+                                      getExceptionMessage(e));
           logError(ErrorLogCategory.BACKEND, ErrorLogSeverity.SEVERE_ERROR,
                    message, msgID);
           return 1;
@@ -653,8 +653,7 @@
         catch (Exception e)
         {
           int    msgID   = MSGID_LDIFEXPORT_CANNOT_DECODE_EXCLUDE_BASE;
-          String message = getMessage(msgID, s,
-                                      stackTraceToSingleLineString(e));
+          String message = getMessage(msgID, s, getExceptionMessage(e));
           logError(ErrorLogCategory.BACKEND, ErrorLogSeverity.SEVERE_ERROR,
                    message, msgID);
           return 1;
@@ -690,8 +689,7 @@
         catch (Exception e)
         {
           int    msgID   = MSGID_LDIFIMPORT_CANNOT_DECODE_INCLUDE_BASE;
-          String message = getMessage(msgID, s,
-                                      stackTraceToSingleLineString(e));
+          String message = getMessage(msgID, s, getExceptionMessage(e));
           logError(ErrorLogCategory.BACKEND, ErrorLogSeverity.SEVERE_ERROR,
                    message, msgID);
           return 1;
@@ -782,7 +780,7 @@
     {
       int    msgID   = MSGID_LDIFEXPORT_CANNOT_LOCK_BACKEND;
       String message = getMessage(msgID, backend.getBackendID(),
-                                  stackTraceToSingleLineString(e));
+                                  getExceptionMessage(e));
       logError(ErrorLogCategory.BACKEND, ErrorLogSeverity.SEVERE_ERROR,
                message, msgID);
       return 0;
@@ -804,7 +802,7 @@
     catch (Exception e)
     {
       int    msgID   = MSGID_LDIFEXPORT_ERROR_DURING_EXPORT;
-      String message = getMessage(msgID, stackTraceToSingleLineString(e));
+      String message = getMessage(msgID, getExceptionMessage(e));
       logError(ErrorLogCategory.BACKEND, ErrorLogSeverity.SEVERE_ERROR, message,
                msgID);
     }
@@ -828,7 +826,7 @@
     {
       int    msgID   = MSGID_LDIFEXPORT_CANNOT_UNLOCK_BACKEND;
       String message = getMessage(msgID, backend.getBackendID(),
-                                  stackTraceToSingleLineString(e));
+                                  getExceptionMessage(e));
       logError(ErrorLogCategory.BACKEND, ErrorLogSeverity.SEVERE_WARNING,
                message, msgID);
     }

--
Gitblit v1.10.0