From 455897cc245b67d929f409a93cfa7106e835cc1f Mon Sep 17 00:00:00 2001
From: boli <boli@localhost>
Date: Thu, 01 Mar 2007 03:27:06 +0000
Subject: [PATCH] This removes old debug logging framework method calls that are going to be automatically instrumented by AspectJ. Non instrumented debug method calls are updated to use the new debug framework methods. However, the new debug logging framework is not yet active as the Aspects are not weaved in. After this revision, debug logging will be disabled in the server until the new AOP framework is complete.
---
opends/src/server/org/opends/server/core/PasswordPolicyConfigManager.java | 25 +++++++------------------
1 files changed, 7 insertions(+), 18 deletions(-)
diff --git a/opends/src/server/org/opends/server/core/PasswordPolicyConfigManager.java b/opends/src/server/org/opends/server/core/PasswordPolicyConfigManager.java
index c8fad01..40ee5c1 100644
--- a/opends/src/server/org/opends/server/core/PasswordPolicyConfigManager.java
+++ b/opends/src/server/org/opends/server/core/PasswordPolicyConfigManager.java
@@ -40,7 +40,9 @@
import org.opends.server.types.ResultCode;
import static org.opends.server.config.ConfigConstants.*;
-import static org.opends.server.loggers.Debug.*;
+import static org.opends.server.loggers.debug.DebugLogger.debugCought;
+import static org.opends.server.loggers.debug.DebugLogger.debugEnabled;
+import org.opends.server.types.DebugLogLevel;
import static org.opends.server.messages.ConfigMessages.*;
import static org.opends.server.messages.MessageHandler.*;
import static org.opends.server.util.StaticUtils.*;
@@ -56,11 +58,6 @@
public class PasswordPolicyConfigManager
implements ConfigAddListener, ConfigDeleteListener
{
- /**
- * The fully-qualified name of this class for debugging purposes.
- */
- private static final String CLASS_NAME =
- "org.opends.server.core.PasswordPolicyConfigManager";
@@ -69,7 +66,6 @@
*/
public PasswordPolicyConfigManager()
{
- assert debugConstructor(CLASS_NAME);
}
@@ -89,7 +85,6 @@
public void initializePasswordPolicies()
throws ConfigException, InitializationException
{
- assert debugEnter(CLASS_NAME, "initializePasswordPolicies");
// First, get the configuration base entry.
@@ -101,8 +96,10 @@
}
catch (Exception e)
{
- assert debugException(CLASS_NAME, "initializePasswordPolicies",
- e);
+ if (debugEnabled())
+ {
+ debugCought(DebugLogLevel.ERROR, e);
+ }
int msgID = MSGID_CONFIG_PWPOLICY_CANNOT_GET_BASE;
String message = getMessage(msgID, String.valueOf(e));
@@ -206,8 +203,6 @@
public boolean configAddIsAcceptable(ConfigEntry configEntry,
StringBuilder unacceptableReason)
{
- assert debugEnter(CLASS_NAME, "configAddIsAcceptable",
- String.valueOf(configEntry), "java.lang.StringBuilder");
// See if we can create a password policy from the provided configuration
@@ -259,8 +254,6 @@
*/
public ConfigChangeResult applyConfigurationAdd(ConfigEntry configEntry)
{
- assert debugEnter(CLASS_NAME, "applyConfigurationAdd",
- String.valueOf(configEntry));
DN configEntryDN = configEntry.getDN();
@@ -322,8 +315,6 @@
public boolean configDeleteIsAcceptable(ConfigEntry configEntry,
StringBuilder unacceptableReason)
{
- assert debugEnter(CLASS_NAME, "configDeleteIsAcceptable",
- String.valueOf(configEntry), "java.lang.StringBuilder");
// We'll allow the policy to be removed as long as it isn't the default.
@@ -357,8 +348,6 @@
*/
public ConfigChangeResult applyConfigurationDelete(ConfigEntry configEntry)
{
- assert debugEnter(CLASS_NAME, "applyConfigurationDelete",
- String.valueOf(configEntry));
// We'll allow the policy to be removed as long as it isn't the default.
--
Gitblit v1.10.0