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/config/ConfigEntry.java | 55 +++++++++++++------------------------------------------
1 files changed, 13 insertions(+), 42 deletions(-)
diff --git a/opends/src/server/org/opends/server/config/ConfigEntry.java b/opends/src/server/org/opends/server/config/ConfigEntry.java
index 6260b40..67c908a 100644
--- a/opends/src/server/org/opends/server/config/ConfigEntry.java
+++ b/opends/src/server/org/opends/server/config/ConfigEntry.java
@@ -22,7 +22,7 @@
* CDDL HEADER END
*
*
- * Portions Copyright 2006 Sun Microsystems, Inc.
+ * Portions Copyright 2006-2007 Sun Microsystems, Inc.
*/
package org.opends.server.config;
@@ -44,9 +44,11 @@
import org.opends.server.types.DN;
import org.opends.server.types.Entry;
import org.opends.server.types.ObjectClass;
+import org.opends.server.types.DebugLogLevel;
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 static org.opends.server.messages.ConfigMessages.*;
import static org.opends.server.messages.MessageHandler.*;
import static org.opends.server.util.StaticUtils.*;
@@ -60,11 +62,6 @@
*/
public class ConfigEntry
{
- /**
- * The fully-qualified name of this class for debugging purposes.
- */
- private static final String CLASS_NAME =
- "org.opends.server.config.ConfigEntry";
@@ -101,8 +98,6 @@
*/
public ConfigEntry(Entry entry, ConfigEntry parent)
{
- assert debugConstructor(CLASS_NAME, String.valueOf(entry),
- String.valueOf(parent));
this.entry = entry;
this.parent = parent;
@@ -123,7 +118,6 @@
*/
public Entry getEntry()
{
- assert debugEnter(CLASS_NAME, "getEntry");
return entry;
}
@@ -142,7 +136,6 @@
*/
public void setEntry(Entry entry)
{
- assert debugEnter(CLASS_NAME, "setEntry", String.valueOf(entry));
entryLock.lock();
@@ -165,7 +158,6 @@
*/
public DN getDN()
{
- assert debugEnter(CLASS_NAME, "getDN");
return entry.getDN();
}
@@ -184,7 +176,6 @@
*/
public boolean hasObjectClass(String name)
{
- assert debugEnter(CLASS_NAME, "hasObjectClass", String.valueOf(name));
ObjectClass oc = DirectoryServer.getObjectClass(name.toLowerCase());
if (oc == null)
@@ -215,7 +206,6 @@
public ConfigAttribute getConfigAttribute(ConfigAttribute stub)
throws ConfigException
{
- assert debugEnter(CLASS_NAME, "getConfigAttribute", String.valueOf(stub));
String attrName = stub.getName();
AttributeType attrType =
@@ -246,8 +236,6 @@
*/
public void putConfigAttribute(ConfigAttribute attribute)
{
- assert debugEnter(CLASS_NAME, "putConfigAttribute",
- String.valueOf(attribute));
String name = attribute.getName();
AttributeType attrType =
@@ -285,8 +273,6 @@
*/
public boolean removeConfigAttribute(String lowerName)
{
- assert debugEnter(CLASS_NAME, "removeConfigAttribute",
- String.valueOf(lowerName));
for (AttributeType t : entry.getUserAttributes().keySet())
{
@@ -321,7 +307,6 @@
*/
public ConfigEntry getParent()
{
- assert debugEnter(CLASS_NAME, "getParent");
return parent;
}
@@ -336,7 +321,6 @@
*/
public ConcurrentHashMap<DN,ConfigEntry> getChildren()
{
- assert debugEnter(CLASS_NAME, "getChildren");
return children;
}
@@ -351,7 +335,6 @@
*/
public boolean hasChildren()
{
- assert debugEnter(CLASS_NAME, "hasChildren");
return (! children.isEmpty());
}
@@ -374,7 +357,6 @@
public void addChild(ConfigEntry childEntry)
throws ConfigException
{
- assert debugEnter(CLASS_NAME, "addChild", String.valueOf(childEntry));
ConfigEntry conflictingChild;
@@ -387,7 +369,10 @@
}
catch (Exception e)
{
- assert debugException(CLASS_NAME, "addChild", e);
+ if (debugEnabled())
+ {
+ debugCought(DebugLogLevel.ERROR, e);
+ }
conflictingChild = null;
}
@@ -424,7 +409,6 @@
public ConfigEntry removeChild(DN childDN)
throws ConfigException
{
- assert debugEnter(CLASS_NAME, "removeChild", String.valueOf(childDN));
entryLock.lock();
@@ -456,9 +440,12 @@
}
catch (Exception e)
{
- assert debugException(CLASS_NAME, "removeChild", e);
+ if (debugEnabled())
+ {
+ debugCought(DebugLogLevel.ERROR, e);
+ }
- int msgID = MSGID_CONFIG_ENTRY_CANNOT_REMOVE_CHILD;
+ int msgID = MSGID_CONFIG_ENTRY_CANNOT_REMOVE_CHILD;
String message = getMessage(msgID, String.valueOf(childDN),
String.valueOf(entry.getDN()),
stackTraceToSingleLineString(e));
@@ -486,7 +473,6 @@
*/
public ConfigEntry duplicate()
{
- assert debugEnter(CLASS_NAME, "duplicate");
return new ConfigEntry(entry.duplicate(), parent);
}
@@ -502,7 +488,6 @@
*/
public CopyOnWriteArrayList<ConfigChangeListener> getChangeListeners()
{
- assert debugEnter(CLASS_NAME, "getChangeListeners");
return changeListeners;
}
@@ -518,8 +503,6 @@
*/
public void registerChangeListener(ConfigChangeListener listener)
{
- assert debugEnter(CLASS_NAME, "registerChangeListener",
- String.valueOf(listener));
changeListeners.add(listener);
}
@@ -537,8 +520,6 @@
*/
public boolean deregisterChangeListener(ConfigChangeListener listener)
{
- assert debugEnter(CLASS_NAME, "deregisterChangeListener",
- String.valueOf(listener));
return changeListeners.remove(listener);
}
@@ -554,7 +535,6 @@
*/
public CopyOnWriteArrayList<ConfigAddListener> getAddListeners()
{
- assert debugEnter(CLASS_NAME, "getAddListeners");
return addListeners;
}
@@ -569,8 +549,6 @@
*/
public void registerAddListener(ConfigAddListener listener)
{
- assert debugEnter(CLASS_NAME, "registerAddListener",
- String.valueOf(listener));
addListeners.addIfAbsent(listener);
}
@@ -586,8 +564,6 @@
*/
public void deregisterAddListener(ConfigAddListener listener)
{
- assert debugEnter(CLASS_NAME, "deregisterAddListener",
- String.valueOf(listener));
addListeners.remove(listener);
}
@@ -603,7 +579,6 @@
*/
public CopyOnWriteArrayList<ConfigDeleteListener> getDeleteListeners()
{
- assert debugEnter(CLASS_NAME, "getDeleteListeners");
return deleteListeners;
}
@@ -618,8 +593,6 @@
*/
public void registerDeleteListener(ConfigDeleteListener listener)
{
- assert debugEnter(CLASS_NAME, "registerDeleteListener",
- String.valueOf(listener));
deleteListeners.addIfAbsent(listener);
}
@@ -634,8 +607,6 @@
*/
public void deregisterDeleteListener(ConfigDeleteListener listener)
{
- assert debugEnter(CLASS_NAME, "deregisterDeleteListener",
- String.valueOf(listener));
deleteListeners.remove(listener);
}
--
Gitblit v1.10.0