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/SoftReferenceEntryCache.java | 34 ++++++++++++++++------------------
1 files changed, 16 insertions(+), 18 deletions(-)
diff --git a/opends/src/server/org/opends/server/extensions/SoftReferenceEntryCache.java b/opends/src/server/org/opends/server/extensions/SoftReferenceEntryCache.java
index c65a13a..538cb3d 100644
--- a/opends/src/server/org/opends/server/extensions/SoftReferenceEntryCache.java
+++ b/opends/src/server/org/opends/server/extensions/SoftReferenceEntryCache.java
@@ -212,7 +212,7 @@
// Log an error message.
logError(ErrorLogCategory.CONFIGURATION, ErrorLogSeverity.SEVERE_ERROR,
MSGID_SOFTREFCACHE_CANNOT_DETERMINE_LOCK_TIMEOUT,
- String.valueOf(configEntryDN), stackTraceToSingleLineString(e),
+ String.valueOf(configEntryDN), getExceptionMessage(e),
lockTimeout);
}
@@ -260,7 +260,7 @@
ErrorLogSeverity.SEVERE_WARNING,
MSGID_SOFTREFCACHE_CANNOT_DECODE_INCLUDE_FILTER,
String.valueOf(configEntryDN), filterString,
- stackTraceToSingleLineString(e));
+ getExceptionMessage(e));
}
}
@@ -284,7 +284,7 @@
// Log an error message.
logError(ErrorLogCategory.CONFIGURATION, ErrorLogSeverity.SEVERE_ERROR,
MSGID_SOFTREFCACHE_CANNOT_DETERMINE_INCLUDE_FILTERS,
- String.valueOf(configEntryDN), stackTraceToSingleLineString(e));
+ String.valueOf(configEntryDN), getExceptionMessage(e));
}
@@ -331,7 +331,7 @@
ErrorLogSeverity.SEVERE_WARNING,
MSGID_SOFTREFCACHE_CANNOT_DECODE_EXCLUDE_FILTER,
String.valueOf(configEntryDN), filterString,
- stackTraceToSingleLineString(e));
+ getExceptionMessage(e));
}
}
@@ -355,7 +355,7 @@
// Log an error message.
logError(ErrorLogCategory.CONFIGURATION, ErrorLogSeverity.SEVERE_ERROR,
MSGID_SOFTREFCACHE_CANNOT_DETERMINE_EXCLUDE_FILTERS,
- String.valueOf(configEntryDN), stackTraceToSingleLineString(e));
+ String.valueOf(configEntryDN), getExceptionMessage(e));
}
}
@@ -1162,7 +1162,7 @@
// An error occurred, so the provided value must not be valid.
msgID = MSGID_SOFTREFCACHE_INVALID_LOCK_TIMEOUT;
unacceptableReasons.add(getMessage(msgID, String.valueOf(configEntryDN),
- stackTraceToSingleLineString(e)));
+ getExceptionMessage(e)));
configIsAcceptable = false;
}
@@ -1208,7 +1208,7 @@
unacceptableReasons.add(getMessage(msgID,
String.valueOf(configEntryDN),
filterString,
- stackTraceToSingleLineString(e)));
+ getExceptionMessage(e)));
configIsAcceptable = false;
}
}
@@ -1225,7 +1225,7 @@
// An error occurred, so the provided value must not be valid.
msgID = MSGID_SOFTREFCACHE_INVALID_INCLUDE_FILTERS;
unacceptableReasons.add(getMessage(msgID, String.valueOf(configEntryDN),
- stackTraceToSingleLineString(e)));
+ getExceptionMessage(e)));
configIsAcceptable = false;
}
@@ -1270,8 +1270,8 @@
msgID = MSGID_SOFTREFCACHE_INVALID_EXCLUDE_FILTER;
unacceptableReasons.add(getMessage(msgID,
String.valueOf(configEntryDN),
- filterString,
- stackTraceToSingleLineString(e)));
+ filterString,
+ getExceptionMessage(e)));
configIsAcceptable = false;
}
}
@@ -1288,7 +1288,7 @@
// An error occurred, so the provided value must not be valid.
msgID = MSGID_SOFTREFCACHE_INVALID_EXCLUDE_FILTERS;
unacceptableReasons.add(getMessage(msgID, String.valueOf(configEntryDN),
- stackTraceToSingleLineString(e)));
+ getExceptionMessage(e)));
configIsAcceptable = false;
}
@@ -1351,7 +1351,7 @@
// An error occurred, so the provided value must not be valid.
msgID = MSGID_SOFTREFCACHE_INVALID_LOCK_TIMEOUT;
messages.add(getMessage(msgID, String.valueOf(configEntryDN),
- stackTraceToSingleLineString(e)));
+ getExceptionMessage(e)));
if (resultCode == ResultCode.SUCCESS)
{
@@ -1399,8 +1399,7 @@
// We couldn't decode this filter, so it isn't valid.
msgID = MSGID_SOFTREFCACHE_INVALID_INCLUDE_FILTER;
messages.add(getMessage(msgID, String.valueOf(configEntryDN),
- filterString,
- stackTraceToSingleLineString(e)));
+ filterString, getExceptionMessage(e)));
if (resultCode == ResultCode.SUCCESS)
{
@@ -1423,7 +1422,7 @@
// An error occurred, so the provided value must not be valid.
msgID = MSGID_SOFTREFCACHE_INVALID_INCLUDE_FILTERS;
messages.add(getMessage(msgID, String.valueOf(configEntryDN),
- stackTraceToSingleLineString(e)));
+ getExceptionMessage(e)));
if (resultCode == ResultCode.SUCCESS)
{
@@ -1471,8 +1470,7 @@
// We couldn't decode this filter, so it isn't valid.
msgID = MSGID_SOFTREFCACHE_INVALID_EXCLUDE_FILTER;
messages.add(getMessage(msgID, String.valueOf(configEntryDN),
- filterString,
- stackTraceToSingleLineString(e)));
+ filterString, getExceptionMessage(e)));
if (resultCode == ResultCode.SUCCESS)
{
@@ -1495,7 +1493,7 @@
// An error occurred, so the provided value must not be valid.
msgID = MSGID_SOFTREFCACHE_INVALID_EXCLUDE_FILTERS;
messages.add(getMessage(msgID, String.valueOf(configEntryDN),
- stackTraceToSingleLineString(e)));
+ getExceptionMessage(e)));
if (resultCode == ResultCode.SUCCESS)
{
--
Gitblit v1.10.0