From b30f406570114a5a7de645fd46fc7b4bc619fb09 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Mon, 20 Oct 2014 12:11:48 +0000
Subject: [PATCH] Autorefactored simplifying expressions: - removed useless parentheses - added parentheses to disambiguate expressions - removed useless use of "this" keyword in method calls - removed useless null checks in conjunction with use of instanceof operator
---
opendj-server2x-adapter/src/main/java/org/forgerock/opendj/adapter/server2x/Converters.java | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/opendj-server2x-adapter/src/main/java/org/forgerock/opendj/adapter/server2x/Converters.java b/opendj-server2x-adapter/src/main/java/org/forgerock/opendj/adapter/server2x/Converters.java
index 20e6a13..d19295a 100644
--- a/opendj-server2x-adapter/src/main/java/org/forgerock/opendj/adapter/server2x/Converters.java
+++ b/opendj-server2x-adapter/src/main/java/org/forgerock/opendj/adapter/server2x/Converters.java
@@ -44,6 +44,7 @@
import org.forgerock.opendj.ldap.responses.Responses;
import org.forgerock.opendj.ldap.responses.Result;
import org.forgerock.opendj.ldap.responses.SearchResultEntry;
+import org.opends.messages.MessageBuilder;
import org.opends.server.core.BindOperation;
import org.opends.server.core.CompareOperation;
import org.opends.server.core.ExtendedOperation;
@@ -630,10 +631,10 @@
result.addControl(from(c));
}
}
- result.setDiagnosticMessage((operation.getErrorMessage() != null ? operation
- .getErrorMessage().toString() : null));
- result.setMatchedDN((operation.getMatchedDN() != null) ? operation.getMatchedDN()
- .toString() : null);
+ final MessageBuilder errorMsg = operation.getErrorMessage();
+ org.opends.server.types.DN matchedDN = operation.getMatchedDN();
+ result.setDiagnosticMessage(errorMsg != null ? errorMsg.toString() : null);
+ result.setMatchedDN(matchedDN != null ? matchedDN.toString() : null);
if (result.isSuccess()) {
return result;
} else {
--
Gitblit v1.10.0