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/tasks/BackupTask.java | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/opends/src/server/org/opends/server/tasks/BackupTask.java b/opends/src/server/org/opends/server/tasks/BackupTask.java
index 120b47f..f05b01c 100644
--- a/opends/src/server/org/opends/server/tasks/BackupTask.java
+++ b/opends/src/server/org/opends/server/tasks/BackupTask.java
@@ -33,7 +33,7 @@
import static org.opends.server.messages.MessageHandler.getMessage;
import static org.opends.server.util.ServerConstants.DATE_FORMAT_GMT_TIME;
import static org.opends.server.loggers.Error.logError;
-import static org.opends.server.util.StaticUtils.stackTraceToSingleLineString;
+import static org.opends.server.util.StaticUtils.*;
import static org.opends.server.util.ServerConstants.
BACKUP_DIRECTORY_DESCRIPTOR_FILE;
@@ -41,7 +41,6 @@
import org.opends.server.backends.task.TaskState;
import org.opends.server.core.DirectoryServer;
import org.opends.server.core.LockFileManager;
-import org.opends.server.core.Operation;
import org.opends.server.api.Backend;
import org.opends.server.api.ClientConnection;
import org.opends.server.config.ConfigEntry;
@@ -54,6 +53,7 @@
import org.opends.server.types.Entry;
import org.opends.server.types.ErrorLogCategory;
import org.opends.server.types.ErrorLogSeverity;
+import org.opends.server.types.Operation;
import org.opends.server.types.Privilege;
import org.opends.server.types.ResultCode;
@@ -277,7 +277,7 @@
{
int msgID = MSGID_BACKUPDB_CANNOT_CREATE_BACKUP_DIR;
String message = getMessage(msgID, backupDirectory.getPath(),
- stackTraceToSingleLineString(e));
+ getExceptionMessage(e));
System.err.println(message);
return false;
}
@@ -388,7 +388,7 @@
{
int msgID = MSGID_BACKUPDB_CANNOT_PARSE_BACKUP_DESCRIPTOR;
String message = getMessage(msgID, descriptorPath,
- stackTraceToSingleLineString(e));
+ getExceptionMessage(e));
logError(ErrorLogCategory.BACKEND, ErrorLogSeverity.SEVERE_ERROR,
message, msgID);
return false;
@@ -410,7 +410,7 @@
{
int msgID = MSGID_BACKUPDB_CANNOT_CREATE_BACKUP_DIR;
String message = getMessage(msgID, backupLocation.getPath(),
- stackTraceToSingleLineString(e));
+ getExceptionMessage(e));
logError(ErrorLogCategory.BACKEND, ErrorLogSeverity.SEVERE_ERROR,
message, msgID);
return false;
@@ -453,7 +453,7 @@
DirectoryServer.notifyBackupEnded(b, backupConfig, false);
int msgID = MSGID_BACKUPDB_ERROR_DURING_BACKUP;
String message = getMessage(msgID, b.getBackendID(),
- stackTraceToSingleLineString(e));
+ getExceptionMessage(e));
logError(ErrorLogCategory.BACKEND, ErrorLogSeverity.SEVERE_ERROR,
message, msgID);
return false;
@@ -487,7 +487,7 @@
{
int msgID = MSGID_BACKUPDB_CANNOT_LOCK_BACKEND;
String message = getMessage(msgID, b.getBackendID(),
- stackTraceToSingleLineString(e));
+ getExceptionMessage(e));
logError(ErrorLogCategory.BACKEND, ErrorLogSeverity.SEVERE_ERROR,
message, msgID);
return false;
@@ -521,7 +521,7 @@
{
int msgID = MSGID_BACKUPDB_CANNOT_UNLOCK_BACKEND;
String message = getMessage(msgID, b.getBackendID(),
- stackTraceToSingleLineString(e));
+ getExceptionMessage(e));
logError(ErrorLogCategory.BACKEND,
ErrorLogSeverity.SEVERE_WARNING, message, msgID);
return false;
--
Gitblit v1.10.0