From 14f94c13789b8ace4eae258b5f1d64494518f9c3 Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Mon, 21 Dec 2015 14:04:12 +0000
Subject: [PATCH] Remove null checks on returned values of Entry.get*Attribute*() methods.
---
opendj-server-legacy/src/main/java/org/opends/server/crypto/CryptoManagerSync.java | 44 +++++++-------------------------------------
1 files changed, 7 insertions(+), 37 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/crypto/CryptoManagerSync.java b/opendj-server-legacy/src/main/java/org/opends/server/crypto/CryptoManagerSync.java
index 3fd5e14..6275c01 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/crypto/CryptoManagerSync.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/crypto/CryptoManagerSync.java
@@ -56,7 +56,6 @@
import org.opends.server.core.AddOperation;
import org.opends.server.core.DeleteOperation;
import org.opends.server.core.DirectoryServer;
-import org.opends.server.protocols.internal.InternalClientConnection;
import org.opends.server.protocols.internal.InternalSearchOperation;
import org.opends.server.protocols.internal.SearchRequest;
import org.opends.server.protocols.ldap.LDAPControl;
@@ -219,8 +218,6 @@
}
}
-
- /** {@inheritDoc} */
@Override
public void performBackendPreInitializationProcessing(Backend<?> backend)
{
@@ -237,7 +234,6 @@
}
}
- /** {@inheritDoc} */
@Override
public void performBackendPostFinalizationProcessing(Backend<?> backend)
{
@@ -366,25 +362,10 @@
List<Attribute> dstList = dstEntry.getAttribute(attrCert);
// Check for changes to the certificate value.
- boolean differ = false;
- if (srcList == null)
+ if (!srcList.equals(dstList))
{
- if (dstList != null)
- {
- differ = true;
- }
- }
- else if (dstList == null
- || srcList.size() != dstList.size()
- || !srcList.equals(dstList))
- {
- differ = true;
- }
-
- if (differ)
- {
- // The trust store backend does not implement modify so we need to
- // delete then add.
+ // The trust store backend does not implement modify so we need to delete then add.
+ // FIXME implement TrustStoreBackend.replaceEntry() as deleteEntry() + addEntry() and stop this madness
DN dstDN = dstEntry.getName();
deleteEntry(dstDN);
addEntry(srcEntry, dstDN);
@@ -398,11 +379,7 @@
*/
private static void deleteEntry(DN dstDN)
{
- InternalClientConnection conn =
- InternalClientConnection.getRootConnection();
-
- DeleteOperation delOperation = conn.processDelete(dstDN);
-
+ DeleteOperation delOperation = getRootConnection().processDelete(dstDN);
if (delOperation.getResultCode() != ResultCode.SUCCESS)
{
logger.debug(INFO_TRUSTSTORESYNC_DELETE_FAILED, dstDN, delOperation.getErrorMessage());
@@ -425,29 +402,24 @@
List<Attribute> attrList;
attrList = srcEntry.getAttribute(attrAlias);
- if (attrList != null)
+ if (!attrList.isEmpty())
{
userAttrs.put(attrAlias, attrList);
}
attrList = srcEntry.getAttribute(attrCert);
- if (attrList != null)
+ if (!attrList.isEmpty())
{
userAttrs.put(attrCert, attrList);
}
Entry addEntry = new Entry(dstDN, ocMap, userAttrs, null);
-
- InternalClientConnection conn =
- InternalClientConnection.getRootConnection();
-
- AddOperation addOperation = conn.processAdd(addEntry);
+ AddOperation addOperation = getRootConnection().processAdd(addEntry);
if (addOperation.getResultCode() != ResultCode.SUCCESS)
{
logger.debug(INFO_TRUSTSTORESYNC_ADD_FAILED, dstDN, addOperation.getErrorMessage());
}
}
- /** {@inheritDoc} */
@Override
public PostResponse doPostResponse(PostResponseAddOperation op)
{
@@ -502,7 +474,6 @@
}
}
- /** {@inheritDoc} */
@Override
public PostResponse doPostResponse(PostResponseDeleteOperation op)
{
@@ -527,7 +498,6 @@
return PostResponse.continueOperationProcessing();
}
- /** {@inheritDoc} */
@Override
public PostResponse doPostResponse(PostResponseModifyOperation op)
{
--
Gitblit v1.10.0