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/Adapters.java | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/opendj-server2x-adapter/src/main/java/org/forgerock/opendj/adapter/server2x/Adapters.java b/opendj-server2x-adapter/src/main/java/org/forgerock/opendj/adapter/server2x/Adapters.java
index aed623a..ef5bc87 100644
--- a/opendj-server2x-adapter/src/main/java/org/forgerock/opendj/adapter/server2x/Adapters.java
+++ b/opendj-server2x-adapter/src/main/java/org/forgerock/opendj/adapter/server2x/Adapters.java
@@ -235,10 +235,11 @@
@Override
public Result modifyDN(final ModifyDNRequest request) throws LdapException {
final ModifyDNOperation modifyDNOperation =
- icc.processModifyDN(to(valueOf(request.getName())), to(valueOf(request
- .getNewRDN())), request.isDeleteOldRDN(),
- (request.getNewSuperior() != null ? to(valueOf(request
- .getNewSuperior())) : null), to(request.getControls()));
+ icc.processModifyDN(to(valueOf(request.getName())),
+ to(valueOf(request.getNewRDN())),
+ request.isDeleteOldRDN(),
+ (request.getNewSuperior() != null ? to(valueOf(request.getNewSuperior())) : null),
+ to(request.getControls()));
return getResponseResult(modifyDNOperation);
}
@@ -285,10 +286,10 @@
return extendedResult;
} catch (DecodeException e) {
+ org.opends.server.types.DN matchedDN = extendedOperation.getMatchedDN();
return request.getResultDecoder().newExtendedErrorResult(
ResultCode.valueOf(extendedOperation.getResultCode().getIntValue()),
- (extendedOperation.getMatchedDN() != null ? extendedOperation
- .getMatchedDN().toString() : null),
+ matchedDN != null ? matchedDN.toString() : null,
extendedOperation.getErrorMessage().toString());
}
}
--
Gitblit v1.10.0