From 44aad3f84d2a820094f3b5e73722778edc8c23f5 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:

---
 opends/src/server/org/opends/server/extensions/ConfigFileHandler.java |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/opends/src/server/org/opends/server/extensions/ConfigFileHandler.java b/opends/src/server/org/opends/server/extensions/ConfigFileHandler.java
index 4a159c6..584d5b0 100644
--- a/opends/src/server/org/opends/server/extensions/ConfigFileHandler.java
+++ b/opends/src/server/org/opends/server/extensions/ConfigFileHandler.java
@@ -703,7 +703,7 @@
 
       int    msgID   = MSGID_CONFIG_CANNOT_REGISTER_AS_PRIVATE_SUFFIX;
       String message = getMessage(msgID, configRootEntry.getDN(),
-                                  stackTraceToSingleLineString(e));
+                                  getExceptionMessage(e));
       throw new InitializationException(msgID, message, e);
     }
   }
@@ -1142,7 +1142,7 @@
         int    msgID   = MSGID_CONFIG_FILE_ADD_FAILED;
         String message = getMessage(msgID, String.valueOf(entryDN),
                                     String.valueOf(parentDN),
-                                    stackTraceToSingleLineString(ce));
+                                    getExceptionMessage(ce));
         throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
                                      message, msgID);
       }
@@ -1290,7 +1290,7 @@
         int    msgID   = MSGID_CONFIG_FILE_DELETE_FAILED;
         String message = getMessage(msgID, String.valueOf(entryDN),
                                     String.valueOf(parentEntry.getDN()),
-                                    stackTraceToSingleLineString(ce));
+                                    getExceptionMessage(ce));
         throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
                                      message, msgID);
       }
@@ -2363,7 +2363,7 @@
       }
 
       msgID   = MSGID_CONFIG_BACKUP_CANNOT_DETERMINE_CONFIG_FILE_LOCATION;
-      message = getMessage(msgID, stackTraceToSingleLineString(e));
+      message = getMessage(msgID, getExceptionMessage(e));
       throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
                                    message, msgID, e);
     }
@@ -2511,7 +2511,7 @@
 
       msgID   = MSGID_CONFIG_BACKUP_CANNOT_CLOSE_ZIP_STREAM;
       message = getMessage(msgID, filename, backupDirectory.getPath(),
-                           stackTraceToSingleLineString(e));
+                           getExceptionMessage(e));
       throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
                                    message, msgID, e);
     }
@@ -2839,7 +2839,7 @@
         int    msgID   = MSGID_CONFIG_RESTORE_CANNOT_BACKUP_EXISTING_CONFIG;
         String message = getMessage(msgID, backupID, configDirPath,
                                     String.valueOf(backupDirPath),
-                                    stackTraceToSingleLineString(e));
+                                    getExceptionMessage(e));
         throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
                                      message, msgID, e);
       }
@@ -2876,7 +2876,7 @@
 
         int    msgID   = MSGID_CONFIG_RESTORE_CANNOT_CREATE_CONFIG_DIRECTORY;
         String message = getMessage(msgID, backupID, configDirPath,
-                                    stackTraceToSingleLineString(e));
+                                    getExceptionMessage(e));
         throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
                                      message, msgID, e);
       }
@@ -3041,7 +3041,7 @@
     {
       int    msgID   = MSGID_CONFIG_RESTORE_ERROR_ON_ZIP_STREAM_CLOSE;
       String message = getMessage(msgID, backupID, backupFile.getPath(),
-                                  stackTraceToSingleLineString(e));
+                                  getExceptionMessage(e));
       throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
                                    message, msgID, e);
     }

--
Gitblit v1.10.0