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/extensions/ExternalSASLMechanismHandler.java | 69 +++++++++++++++++++---------------
1 files changed, 39 insertions(+), 30 deletions(-)
diff --git a/opends/src/server/org/opends/server/extensions/ExternalSASLMechanismHandler.java b/opends/src/server/org/opends/server/extensions/ExternalSASLMechanismHandler.java
index 3a285fb..207ede2 100644
--- a/opends/src/server/org/opends/server/extensions/ExternalSASLMechanismHandler.java
+++ b/opends/src/server/org/opends/server/extensions/ExternalSASLMechanismHandler.java
@@ -59,7 +59,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.ExtensionsMessages.*;
import static org.opends.server.messages.MessageHandler.*;
import static org.opends.server.util.ServerConstants.*;
@@ -79,11 +81,6 @@
extends SASLMechanismHandler
implements ConfigurableComponent
{
- /**
- * The fully-qualified name of this class for debugging purposes.
- */
- private static final String CLASS_NAME =
- "org.opends.server.extensions.ExternalSASLMechanismHandler";
@@ -129,7 +126,6 @@
{
super();
- assert debugConstructor(CLASS_NAME);
}
@@ -141,8 +137,6 @@
public void initializeSASLMechanismHandler(ConfigEntry configEntry)
throws ConfigException, InitializationException
{
- assert debugEnter(CLASS_NAME, "initializeSASLMechanismHandler",
- String.valueOf(configEntry));
this.configEntryDN = configEntry.getDN();
@@ -176,7 +170,10 @@
}
catch (Exception e)
{
- assert debugException(CLASS_NAME, "initializeSASLMechanismHandler", e);
+ if (debugEnabled())
+ {
+ debugCought(DebugLogLevel.ERROR, e);
+ }
msgID = MSGID_SASLEXTERNAL_CANNOT_GET_VALIDATION_POLICY;
String message = getMessage(msgID, String.valueOf(configEntryDN),
@@ -204,7 +201,10 @@
}
catch (Exception e)
{
- assert debugException(CLASS_NAME, "initializeSASLMechanismHandler", e);
+ if (debugEnabled())
+ {
+ debugCought(DebugLogLevel.ERROR, e);
+ }
msgID = MSGID_SASLEXTERNAL_CANNOT_GET_CERT_ATTR;
String message = getMessage(msgID, String.valueOf(configEntryDN),
@@ -276,7 +276,6 @@
@Override()
public void finalizeSASLMechanismHandler()
{
- assert debugEnter(CLASS_NAME, "finalizeSASLMechanismHandler");
DirectoryServer.deregisterConfigurableComponent(this);
DirectoryServer.deregisterSASLMechanismHandler(SASL_MECHANISM_EXTERNAL);
@@ -291,8 +290,6 @@
@Override()
public void processSASLBind(BindOperation bindOperation)
{
- assert debugEnter(CLASS_NAME, "processSASLBind",
- String.valueOf(bindOperation));
// Get the client connection used for the bind request, and get the
@@ -377,7 +374,10 @@
}
catch (DirectoryException de)
{
- assert debugException(CLASS_NAME, "processSASLBind", de);
+ if (debugEnabled())
+ {
+ debugCought(DebugLogLevel.ERROR, de);
+ }
bindOperation.setResponseData(de);
return;
@@ -453,7 +453,10 @@
}
catch (Exception e)
{
- assert debugException(CLASS_NAME, "processSASLBind", e);
+ if (debugEnabled())
+ {
+ debugCought(DebugLogLevel.ERROR, e);
+ }
bindOperation.setResultCode(ResultCode.INVALID_CREDENTIALS);
@@ -500,7 +503,10 @@
}
catch (Exception e)
{
- assert debugException(CLASS_NAME, "processSASLBind", e);
+ if (debugEnabled())
+ {
+ debugCought(DebugLogLevel.ERROR, e);
+ }
bindOperation.setResultCode(ResultCode.INVALID_CREDENTIALS);
@@ -533,7 +539,6 @@
*/
public DN getConfigurableComponentEntryDN()
{
- assert debugEnter(CLASS_NAME, "getConfigurableComponentEntryDN");
return configEntryDN;
}
@@ -550,7 +555,6 @@
*/
public List<ConfigAttribute> getConfigurationAttributes()
{
- assert debugEnter(CLASS_NAME, "getConfigurationAttributes");
LinkedList<ConfigAttribute> attrList = new LinkedList<ConfigAttribute>();
@@ -594,8 +598,6 @@
public boolean hasAcceptableConfiguration(ConfigEntry configEntry,
List<String> unacceptableReasons)
{
- assert debugEnter(CLASS_NAME, "hasAcceptableConfiguration",
- String.valueOf(configEntry), "java.util.List<String>");
// Look at the validation policy configuration.
@@ -624,7 +626,10 @@
}
catch (Exception e)
{
- assert debugException(CLASS_NAME, "hasAcceptableConfiguration", e);
+ if (debugEnabled())
+ {
+ debugCought(DebugLogLevel.ERROR, e);
+ }
msgID = MSGID_SASLEXTERNAL_CANNOT_GET_VALIDATION_POLICY;
unacceptableReasons.add(getMessage(msgID, String.valueOf(configEntryDN),
@@ -651,7 +656,10 @@
}
catch (Exception e)
{
- assert debugException(CLASS_NAME, "hasAcceptableConfiguration", e);
+ if (debugEnabled())
+ {
+ debugCought(DebugLogLevel.ERROR, e);
+ }
msgID = MSGID_SASLEXTERNAL_CANNOT_GET_CERT_ATTR;
unacceptableReasons.add(getMessage(msgID, String.valueOf(configEntryDN),
@@ -734,9 +742,6 @@
public ConfigChangeResult applyNewConfiguration(ConfigEntry configEntry,
boolean detailedResults)
{
- assert debugEnter(CLASS_NAME, "applyNewConfiguration",
- String.valueOf(configEntry),
- String.valueOf(detailedResults));
ResultCode resultCode = ResultCode.SUCCESS;
@@ -773,7 +778,10 @@
}
catch (Exception e)
{
- assert debugException(CLASS_NAME, "applyNewConfiguration", e);
+ if (debugEnabled())
+ {
+ debugCought(DebugLogLevel.ERROR, e);
+ }
resultCode = ResultCode.INVALID_ATTRIBUTE_SYNTAX;
@@ -801,7 +809,10 @@
}
catch (Exception e)
{
- assert debugException(CLASS_NAME, "applyNewConfiguration", e);
+ if (debugEnabled())
+ {
+ debugCought(DebugLogLevel.ERROR, e);
+ }
msgID = MSGID_SASLEXTERNAL_CANNOT_GET_CERT_ATTR;
messages.add(getMessage(msgID, String.valueOf(configEntryDN),
@@ -927,7 +938,6 @@
@Override()
public boolean isPasswordBased(String mechanism)
{
- assert debugEnter(CLASS_NAME, "isPasswordBased", String.valueOf(mechanism));
// This is not a password-based mechanism.
return false;
@@ -941,7 +951,6 @@
@Override()
public boolean isSecure(String mechanism)
{
- assert debugEnter(CLASS_NAME, "isSecure", String.valueOf(mechanism));
// This may be considered a secure mechanism.
return true;
--
Gitblit v1.10.0