From ca669ae54f86dbeea277280690584d9f591c7571 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Wed, 18 Feb 2015 07:26:26 +0000
Subject: [PATCH] AutoRefactor: collapse if statements
---
opendj-server-legacy/src/main/java/org/opends/server/plugins/SambaPasswordPlugin.java | 30 ++++++++++++++----------------
1 files changed, 14 insertions(+), 16 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/plugins/SambaPasswordPlugin.java b/opendj-server-legacy/src/main/java/org/opends/server/plugins/SambaPasswordPlugin.java
index 9c33da8..a2afe03 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/plugins/SambaPasswordPlugin.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/plugins/SambaPasswordPlugin.java
@@ -692,17 +692,16 @@
*/
final DN authDN = extendedOperation.getAuthorizationDN();
final DN sambaAdminDN = config.getSambaAdministratorDN();
- if (sambaAdminDN != null && !sambaAdminDN.isRootDN())
+ if (sambaAdminDN != null
+ && !sambaAdminDN.isRootDN()
+ && authDN.equals(sambaAdminDN))
{
- if (authDN.equals(sambaAdminDN))
+ if (logger.isTraceEnabled())
{
- if (logger.isTraceEnabled())
- {
- logger.trace("This operation will be skipped because"
- + " it was performed by Samba admin user: " + sambaAdminDN);
- }
- return PluginResult.PostOperation.continueOperationProcessing();
+ logger.trace("This operation will be skipped because"
+ + " it was performed by Samba admin user: " + sambaAdminDN);
}
+ return PluginResult.PostOperation.continueOperationProcessing();
}
// Get the name of the entry and clear passwords from the operation
@@ -839,17 +838,16 @@
*/
final DN authDN = modifyOperation.getAuthorizationDN();
final DN sambaAdminDN = config.getSambaAdministratorDN();
- if (sambaAdminDN != null && !sambaAdminDN.isRootDN())
+ if (sambaAdminDN != null
+ && !sambaAdminDN.isRootDN()
+ && authDN.equals(sambaAdminDN))
{
- if (authDN.equals(sambaAdminDN))
+ if (logger.isTraceEnabled())
{
- if (logger.isTraceEnabled())
- {
- logger.trace("This operation will be skipped because"
- + " it was performed by Samba admin user: " + sambaAdminDN);
- }
- return PluginResult.PreOperation.continueOperationProcessing();
+ logger.trace("This operation will be skipped because"
+ + " it was performed by Samba admin user: " + sambaAdminDN);
}
+ return PluginResult.PreOperation.continueOperationProcessing();
}
/*
--
Gitblit v1.10.0