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/PKCS11KeyManagerProvider.java | 37 ++++++++++++++++++-------------------
1 files changed, 18 insertions(+), 19 deletions(-)
diff --git a/opends/src/server/org/opends/server/extensions/PKCS11KeyManagerProvider.java b/opends/src/server/org/opends/server/extensions/PKCS11KeyManagerProvider.java
index 4b9fc96..a00b9fc 100644
--- a/opends/src/server/org/opends/server/extensions/PKCS11KeyManagerProvider.java
+++ b/opends/src/server/org/opends/server/extensions/PKCS11KeyManagerProvider.java
@@ -194,7 +194,7 @@
msgID = MSGID_PKCS11_KEYMANAGER_CANNOT_DETERMINE_PIN_PROPERTY;
String message = getMessage(msgID, String.valueOf(configEntryDN),
- stackTraceToSingleLineString(e));
+ getExceptionMessage(e));
throw new InitializationException(msgID, message, e);
}
@@ -244,7 +244,7 @@
msgID = MSGID_PKCS11_KEYMANAGER_CANNOT_DETERMINE_PIN_ENVAR;
String message = getMessage(msgID, String.valueOf(configEntryDN),
- stackTraceToSingleLineString(e));
+ getExceptionMessage(e));
throw new InitializationException(msgID, message, e);
}
@@ -284,7 +284,7 @@
msgID = MSGID_PKCS11_KEYMANAGER_PIN_FILE_CANNOT_READ;
String message = getMessage(msgID, String.valueOf(fileName),
String.valueOf(configEntryDN),
- stackTraceToSingleLineString(ioe));
+ getExceptionMessage(ioe));
throw new InitializationException(msgID, message, ioe);
}
@@ -322,7 +322,7 @@
msgID = MSGID_PKCS11_KEYMANAGER_CANNOT_DETERMINE_PIN_FILE;
String message = getMessage(msgID, String.valueOf(configEntryDN),
- stackTraceToSingleLineString(e));
+ getExceptionMessage(e));
throw new InitializationException(msgID, message, e);
}
@@ -350,7 +350,7 @@
msgID = MSGID_PKCS11_KEYMANAGER_CANNOT_DETERMINE_PIN_FROM_ATTR;
String message = getMessage(msgID, String.valueOf(configEntryDN),
- stackTraceToSingleLineString(e));
+ getExceptionMessage(e));
throw new InitializationException(msgID, message, e);
}
}
@@ -446,8 +446,7 @@
int msgID = MSGID_PKCS11_KEYMANAGER_PIN_FILE_CANNOT_READ;
String message = getMessage(msgID, String.valueOf(fileName),
- String.valueOf(configEntryDN),
- stackTraceToSingleLineString(ioe));
+ String.valueOf(configEntryDN), getExceptionMessage(ioe));
throw new InitializationException(msgID, message, ioe);
}
@@ -513,7 +512,7 @@
}
int msgID = MSGID_PKCS11_KEYMANAGER_CANNOT_LOAD;
- String message = getMessage(msgID, stackTraceToSingleLineString(e));
+ String message = getMessage(msgID, getExceptionMessage(e));
throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
message, msgID, e);
}
@@ -535,7 +534,7 @@
}
int msgID = MSGID_PKCS11_KEYMANAGER_CANNOT_CREATE_FACTORY;
- String message = getMessage(msgID, stackTraceToSingleLineString(e));
+ String message = getMessage(msgID, getExceptionMessage(e));
throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
message, msgID, e);
}
@@ -678,7 +677,7 @@
msgID = MSGID_PKCS11_KEYMANAGER_CANNOT_DETERMINE_PIN_PROPERTY;
String message = getMessage(msgID, String.valueOf(configEntryDN),
- stackTraceToSingleLineString(e));
+ getExceptionMessage(e));
unacceptableReasons.add(message);
return false;
}
@@ -720,7 +719,7 @@
msgID = MSGID_PKCS11_KEYMANAGER_CANNOT_DETERMINE_PIN_ENVAR;
String message = getMessage(msgID, String.valueOf(configEntryDN),
- stackTraceToSingleLineString(e));
+ getExceptionMessage(e));
unacceptableReasons.add(message);
return false;
}
@@ -762,7 +761,7 @@
msgID = MSGID_PKCS11_KEYMANAGER_PIN_FILE_CANNOT_READ;
String message = getMessage(msgID, String.valueOf(fileName),
String.valueOf(configEntryDN),
- stackTraceToSingleLineString(ioe));
+ getExceptionMessage(ioe));
unacceptableReasons.add(message);
return false;
}
@@ -792,7 +791,7 @@
msgID = MSGID_PKCS11_KEYMANAGER_CANNOT_DETERMINE_PIN_FILE;
String message = getMessage(msgID, String.valueOf(configEntryDN),
- stackTraceToSingleLineString(e));
+ getExceptionMessage(e));
unacceptableReasons.add(message);
return false;
}
@@ -821,7 +820,7 @@
msgID = MSGID_PKCS11_KEYMANAGER_CANNOT_DETERMINE_PIN_FROM_ATTR;
String message = getMessage(msgID, String.valueOf(configEntryDN),
- stackTraceToSingleLineString(e));
+ getExceptionMessage(e));
unacceptableReasons.add(message);
return false;
}
@@ -918,7 +917,7 @@
msgID = MSGID_PKCS11_KEYMANAGER_CANNOT_DETERMINE_PIN_PROPERTY;
messages.add(getMessage(msgID, String.valueOf(configEntryDN),
- stackTraceToSingleLineString(e)));
+ getExceptionMessage(e)));
if (resultCode == ResultCode.SUCCESS)
{
@@ -971,7 +970,7 @@
msgID = MSGID_PKCS11_KEYMANAGER_CANNOT_DETERMINE_PIN_ENVAR;
messages.add(getMessage(msgID, String.valueOf(configEntryDN),
- stackTraceToSingleLineString(e)));
+ getExceptionMessage(e)));
if (resultCode == ResultCode.SUCCESS)
{
@@ -1023,7 +1022,7 @@
msgID = MSGID_PKCS11_KEYMANAGER_PIN_FILE_CANNOT_READ;
messages.add(getMessage(msgID, String.valueOf(fileName),
String.valueOf(configEntryDN),
- stackTraceToSingleLineString(ioe)));
+ getExceptionMessage(ioe)));
if (resultCode == ResultCode.SUCCESS)
{
@@ -1064,7 +1063,7 @@
msgID = MSGID_PKCS11_KEYMANAGER_CANNOT_DETERMINE_PIN_FILE;
messages.add(getMessage(msgID, String.valueOf(configEntryDN),
- stackTraceToSingleLineString(e)));
+ getExceptionMessage(e)));
if (resultCode == ResultCode.SUCCESS)
{
@@ -1098,7 +1097,7 @@
msgID = MSGID_PKCS11_KEYMANAGER_CANNOT_DETERMINE_PIN_FROM_ATTR;
messages.add(getMessage(msgID, String.valueOf(configEntryDN),
- stackTraceToSingleLineString(e)));
+ getExceptionMessage(e)));
if (resultCode == ResultCode.SUCCESS)
{
--
Gitblit v1.10.0