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/core/DeleteOperation.java | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/opends/src/server/org/opends/server/core/DeleteOperation.java b/opends/src/server/org/opends/server/core/DeleteOperation.java
index 906aa35..4a4f7f3 100644
--- a/opends/src/server/org/opends/server/core/DeleteOperation.java
+++ b/opends/src/server/org/opends/server/core/DeleteOperation.java
@@ -46,7 +46,6 @@
import org.opends.server.controls.ProxiedAuthV1Control;
import org.opends.server.controls.ProxiedAuthV2Control;
import org.opends.server.protocols.asn1.ASN1OctetString;
-import org.opends.server.protocols.ldap.LDAPException;
import org.opends.server.types.AttributeType;
import org.opends.server.types.ByteString;
import org.opends.server.types.CancelledOperationException;
@@ -59,7 +58,9 @@
import org.opends.server.types.Entry;
import org.opends.server.types.ErrorLogCategory;
import org.opends.server.types.ErrorLogSeverity;
+import org.opends.server.types.LDAPException;
import org.opends.server.types.LockManager;
+import org.opends.server.types.Operation;
import org.opends.server.types.OperationType;
import org.opends.server.types.Privilege;
import org.opends.server.types.ResultCode;
@@ -648,7 +649,7 @@
ErrorLogSeverity.SEVERE_ERROR,
MSGID_DELETE_SYNCH_CONFLICT_RESOLUTION_FAILED,
getConnectionID(), getOperationID(),
- stackTraceToSingleLineString(de));
+ getExceptionMessage(de));
setResponseData(de);
break deleteProcessing;
@@ -1093,7 +1094,7 @@
logError(ErrorLogCategory.SYNCHRONIZATION,
ErrorLogSeverity.SEVERE_ERROR,
MSGID_DELETE_SYNCH_PREOP_FAILED, getConnectionID(),
- getOperationID(), stackTraceToSingleLineString(de));
+ getOperationID(), getExceptionMessage(de));
setResponseData(de);
break deleteProcessing;
@@ -1212,7 +1213,7 @@
logError(ErrorLogCategory.SYNCHRONIZATION,
ErrorLogSeverity.SEVERE_ERROR,
MSGID_DELETE_SYNCH_POSTOP_FAILED, getConnectionID(),
- getOperationID(), stackTraceToSingleLineString(de));
+ getOperationID(), getExceptionMessage(de));
setResponseData(de);
break;
@@ -1264,7 +1265,7 @@
}
int msgID = MSGID_DELETE_ERROR_NOTIFYING_CHANGE_LISTENER;
- String message = getMessage(msgID, stackTraceToSingleLineString(e));
+ String message = getMessage(msgID, getExceptionMessage(e));
logError(ErrorLogCategory.CORE_SERVER, ErrorLogSeverity.SEVERE_ERROR,
message, msgID);
}
@@ -1303,7 +1304,7 @@
int msgID = MSGID_DELETE_ERROR_NOTIFYING_PERSISTENT_SEARCH;
String message = getMessage(msgID, String.valueOf(persistentSearch),
- stackTraceToSingleLineString(e));
+ getExceptionMessage(e));
logError(ErrorLogCategory.CORE_SERVER, ErrorLogSeverity.SEVERE_ERROR,
message, msgID);
@@ -1376,7 +1377,7 @@
* {@inheritDoc}
*/
@Override()
- boolean setCancelRequest(CancelRequest cancelRequest)
+ protected boolean setCancelRequest(CancelRequest cancelRequest)
{
this.cancelRequest = cancelRequest;
return true;
--
Gitblit v1.10.0