From 210e12deeb0afa5d500f9ae2377f0d50cafdb432 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Mon, 29 Jul 2013 07:31:50 +0000
Subject: [PATCH] LocalBackend*Operation.java: Fixed NPEs.
---
opends/src/server/org/opends/server/workflowelement/localbackend/LocalBackendDeleteOperation.java | 22 +++++++++++++---------
1 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/opends/src/server/org/opends/server/workflowelement/localbackend/LocalBackendDeleteOperation.java b/opends/src/server/org/opends/server/workflowelement/localbackend/LocalBackendDeleteOperation.java
index 9f09437..e8c8095 100644
--- a/opends/src/server/org/opends/server/workflowelement/localbackend/LocalBackendDeleteOperation.java
+++ b/opends/src/server/org/opends/server/workflowelement/localbackend/LocalBackendDeleteOperation.java
@@ -27,6 +27,12 @@
*/
package org.opends.server.workflowelement.localbackend;
+import static org.opends.messages.CoreMessages.*;
+import static org.opends.server.loggers.ErrorLogger.*;
+import static org.opends.server.loggers.debug.DebugLogger.*;
+import static org.opends.server.util.ServerConstants.*;
+import static org.opends.server.util.StaticUtils.*;
+
import java.util.List;
import java.util.concurrent.locks.Lock;
@@ -36,7 +42,10 @@
import org.opends.server.api.ClientConnection;
import org.opends.server.api.SynchronizationProvider;
import org.opends.server.api.plugin.PluginResult;
-import org.opends.server.controls.*;
+import org.opends.server.controls.LDAPAssertionRequestControl;
+import org.opends.server.controls.LDAPPreReadRequestControl;
+import org.opends.server.controls.ProxiedAuthV1Control;
+import org.opends.server.controls.ProxiedAuthV2Control;
import org.opends.server.core.*;
import org.opends.server.loggers.debug.DebugTracer;
import org.opends.server.types.*;
@@ -45,12 +54,6 @@
import org.opends.server.types.operation.PostSynchronizationDeleteOperation;
import org.opends.server.types.operation.PreOperationDeleteOperation;
-import static org.opends.messages.CoreMessages.*;
-import static org.opends.server.loggers.ErrorLogger.*;
-import static org.opends.server.loggers.debug.DebugLogger.*;
-import static org.opends.server.util.ServerConstants.*;
-import static org.opends.server.util.StaticUtils.*;
-
/**
* This class defines an operation used to delete an entry in a local backend
* of the Directory Server.
@@ -430,7 +433,8 @@
private DirectoryException newDirectoryException(Entry entry,
ResultCode resultCode, Message message) throws DirectoryException
{
- return LocalBackendWorkflowElement.newDirectoryException(this, entry, null,
+ return LocalBackendWorkflowElement.newDirectoryException(this, entry,
+ entryDN,
resultCode, message, ResultCode.NO_SUCH_OBJECT,
ERR_DELETE_NO_SUCH_ENTRY.get(String.valueOf(entryDN)));
}
@@ -439,7 +443,7 @@
ResultCode resultCode, Message message) throws DirectoryException
{
LocalBackendWorkflowElement.setResultCodeAndMessageNoInfoDisclosure(this,
- entry, null, resultCode, message, ResultCode.NO_SUCH_OBJECT,
+ entry, entryDN, resultCode, message, ResultCode.NO_SUCH_OBJECT,
ERR_DELETE_NO_SUCH_ENTRY.get(String.valueOf(entryDN)));
}
--
Gitblit v1.10.0