From 00b35ebd517c650b44a65e6a8fa74d21afeffc72 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Tue, 16 Jul 2013 07:57:52 +0000
Subject: [PATCH] Respected the Single Responsibility Principle by splitting findAndSetMatchingDN() method into findMatchedDN() and setMatchedDN() methods.
---
opendj-sdk/opends/src/server/org/opends/server/extensions/PasswordModifyExtendedOperation.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/opendj-sdk/opends/src/server/org/opends/server/extensions/PasswordModifyExtendedOperation.java b/opendj-sdk/opends/src/server/org/opends/server/extensions/PasswordModifyExtendedOperation.java
index 3dc3214..a1818b9 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/extensions/PasswordModifyExtendedOperation.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/extensions/PasswordModifyExtendedOperation.java
@@ -124,7 +124,7 @@
/** The reference to the identity mapper. */
private IdentityMapper<?> identityMapper;
- /** The default set of supported control OIDs for this extended */
+ /** The default set of supported control OIDs for this extended. */
private Set<String> supportedControlOIDs = new HashSet<String>(0);
/**
@@ -1242,7 +1242,7 @@
String.valueOf(entryDN)));
// See if one of the entry's ancestors exists.
- findAndSetMatchingDN(operation, entryDN);
+ operation.setMatchedDN(findMatchedDN(entryDN));
return null;
}
@@ -1264,7 +1264,7 @@
}
}
- private void findAndSetMatchingDN(Operation operation, DN entryDN)
+ private DN findMatchedDN(DN entryDN)
{
try
{
@@ -1273,8 +1273,7 @@
{
if (DirectoryServer.entryExists(matchedDN))
{
- operation.setMatchedDN(matchedDN);
- return;
+ return matchedDN;
}
matchedDN = matchedDN.getParentDNInSuffix();
@@ -1287,6 +1286,7 @@
TRACER.debugCaught(DebugLogLevel.ERROR, e);
}
}
+ return null;
}
/**
--
Gitblit v1.10.0