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/authorization/dseecompat/AciHandler.java |   27 ++++++++++++---------------
 1 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/opends/src/server/org/opends/server/authorization/dseecompat/AciHandler.java b/opends/src/server/org/opends/server/authorization/dseecompat/AciHandler.java
index 73d7260..990c3dd 100644
--- a/opends/src/server/org/opends/server/authorization/dseecompat/AciHandler.java
+++ b/opends/src/server/org/opends/server/authorization/dseecompat/AciHandler.java
@@ -30,10 +30,20 @@
 import org.opends.server.api.AccessControlHandler;
 import static org.opends.server.authorization.dseecompat.AciMessages.*;
 import org.opends.server.core.*;
-import static org.opends.server.loggers.Debug.debugEnter;
 import static org.opends.server.loggers.Error.logError;
 import static org.opends.server.messages.MessageHandler.getMessage;
-import org.opends.server.types.*;
+import org.opends.server.types.Attribute;
+import org.opends.server.types.AttributeType;
+import org.opends.server.types.AttributeValue;
+import org.opends.server.types.DN;
+import org.opends.server.types.Entry;
+import org.opends.server.types.ErrorLogCategory;
+import org.opends.server.types.ErrorLogSeverity;
+import org.opends.server.types.Modification;
+import org.opends.server.types.ModificationType;
+import org.opends.server.types.Privilege;
+import org.opends.server.types.SearchResultEntry;
+import org.opends.server.types.SearchResultReference;
 import static org.opends.server.util.StaticUtils.toLowerCase;
 import java.util.LinkedList;
 import java.util.List;
@@ -46,8 +56,6 @@
 public class AciHandler extends AccessControlHandler
 {
 
-    private static final String CLASS_NAME =
-        "org.opends.server.authorization.dseecompat.AciHandler";
 
     /**
      * ACI_ADD is used to set the container rights for a LDAP add operation.
@@ -571,7 +579,6 @@
      * @return  True if access is allowed.
      */
     public boolean isAllowed(AddOperation operation) {
-        assert debugEnter(CLASS_NAME, "isAllowed");
         AciLDAPOperationContainer operationContainer =
                 new AciLDAPOperationContainer(operation, ACI_ADD);
         boolean ret=isAllowed(operationContainer,operation);
@@ -593,7 +600,6 @@
      * @return  True if access is allowed.
      */
    public boolean isAllowed(CompareOperation operation) {
-       assert debugEnter(CLASS_NAME, "isAllowed");
 
        AciLDAPOperationContainer operationContainer =
                new AciLDAPOperationContainer(operation, ACI_COMPARE);
@@ -623,7 +629,6 @@
      * @return  True if access is allowed.
      */
    public boolean isAllowed(DeleteOperation operation) {
-       assert debugEnter(CLASS_NAME, "isAllowed");
        AciLDAPOperationContainer operationContainer=
                new AciLDAPOperationContainer(operation, ACI_DELETE);
        return isAllowed(operationContainer, operation);
@@ -637,7 +642,6 @@
     */
 
   public boolean isAllowed(ModifyOperation operation) {
-      assert debugEnter(CLASS_NAME, "isAllowed");
       AciLDAPOperationContainer operationContainer=
               new AciLDAPOperationContainer(operation, ACI_NULL);
       return aciCheckMods(operationContainer, operation,
@@ -666,7 +670,6 @@
    */
   public boolean
   maySend(SearchOperation operation, SearchResultEntry entry) {
-      assert debugEnter(CLASS_NAME, "maySend");
       AciLDAPOperationContainer operationContainer =
               new AciLDAPOperationContainer(operation,
                                            (ACI_READ | ACI_SEARCH), entry);
@@ -693,7 +696,6 @@
   public SearchResultEntry filterEntry(SearchOperation operation,
                                        SearchResultEntry entry) {
 
-      assert debugEnter(CLASS_NAME, "filterEntry");
       AciLDAPOperationContainer operationContainer =
               new AciLDAPOperationContainer(operation,
                                             (ACI_READ | ACI_SEARCH), entry);
@@ -713,7 +715,6 @@
   @Override
   public boolean maySend(SearchOperation operation,
       SearchResultReference reference) {
-    assert debugEnter(CLASS_NAME, "maySend");
     //TODO: Planned to be implemented.
     return true;
   }
@@ -723,7 +724,6 @@
    */
   @Override
   public boolean isAllowed(ModifyDNOperation modifyDNOperation) {
-      assert debugEnter(CLASS_NAME, "isAllowed");
       // TODO: Planned to be implemented.
       return true;
   }
@@ -734,7 +734,6 @@
    */
   @Override
   public boolean isAllowed(BindOperation bindOperation) {
-      assert debugEnter(CLASS_NAME, "isAllowed");
       //Not planned to be implemented.
       return true;
   }
@@ -744,7 +743,6 @@
    */
   @Override
   public boolean isAllowed(ExtendedOperation extendedOperation) {
-      assert debugEnter(CLASS_NAME, "isAllowed");
       //Not planned to be implemented.
       return true;
   }
@@ -754,7 +752,6 @@
    */
   @Override
   public boolean isAllowed(SearchOperation searchOperation) {
-      assert debugEnter(CLASS_NAME, "isAllowed");
       //Not planned to be implemented.
       return true;
   }

--
Gitblit v1.10.0