Remove the dependence on AspectJ for all non method-entry and method-exit r...

boli

23.30.2007 b0a7e3cf4a65ea95c79cf002596428d0aed2e26e

 opends/src/server/org/opends/server/protocols/ldap/LDAPRequestHandler.java

@@ -44,10 +44,10 @@
import org.opends.server.core.DirectoryServer;
import org.opends.server.types.InitializationException;

import static org.opends.server.loggers.debug.DebugLogger.debugCaught;
import static org.opends.server.loggers.debug.DebugLogger.debugEnabled;
import org.opends.server.types.DebugLogLevel;
import static org.opends.server.loggers.ErrorLogger.*;
import static org.opends.server.loggers.debug.DebugLogger.*;
import org.opends.server.loggers.debug.DebugTracer;
import static org.opends.server.messages.MessageHandler.*;
import static org.opends.server.messages.ProtocolMessages.*;
import org.opends.server.types.DisconnectReason;
@@ -68,6 +68,11 @@
       extends DirectoryThread
       implements ServerShutdownListener
{
  /**
   * The tracer object for the debug logger.
   */
  private static final DebugTracer TRACER = getTracer();




@@ -130,7 +135,7 @@
    {
      if (debugEnabled())
      {
        debugCaught(DebugLogLevel.ERROR, e);
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }

      int msgID = MSGID_LDAP_REQHANDLER_OPEN_SELECTOR_FAILED;
@@ -185,7 +190,7 @@
      {
        if (debugEnabled())
        {
          debugCaught(DebugLogLevel.ERROR, e);
          TRACER.debugCaught(DebugLogLevel.ERROR, e);
        }

        // FIXME -- Should we do something else with this?
@@ -221,7 +226,7 @@
                {
                  if (debugEnabled())
                  {
                    debugCaught(DebugLogLevel.ERROR, e);
                    TRACER.debugCaught(DebugLogLevel.ERROR, e);
                  }

                  // Some other error occurred while we were trying to read data
@@ -236,7 +241,7 @@
              {
                if (debugEnabled())
                {
                  debugCaught(DebugLogLevel.ERROR, e);
                  TRACER.debugCaught(DebugLogLevel.ERROR, e);
                }

                // We got some other kind of error.  If nothing else, cancel the
@@ -260,7 +265,7 @@
          {
            if (debugEnabled())
            {
              debugCaught(DebugLogLevel.ERROR, cke);
              TRACER.debugCaught(DebugLogLevel.ERROR, cke);
            }

            // This could happen if a connection was closed between the time
@@ -272,7 +277,7 @@
          {
            if (debugEnabled())
            {
              debugCaught(DebugLogLevel.ERROR, e);
              TRACER.debugCaught(DebugLogLevel.ERROR, e);
            }

            // This should not happen, and it would have caused our reader
@@ -307,7 +312,7 @@
        {
          if (debugEnabled())
          {
            debugCaught(DebugLogLevel.ERROR, e);
            TRACER.debugCaught(DebugLogLevel.ERROR, e);
          }

          c.disconnect(DisconnectReason.SERVER_ERROR, true,
@@ -386,7 +391,7 @@
        {
          if (debugEnabled())
          {
            debugCaught(DebugLogLevel.ERROR, e);
            TRACER.debugCaught(DebugLogLevel.ERROR, e);
          }
        }

@@ -398,7 +403,7 @@
        {
          if (debugEnabled())
          {
            debugCaught(DebugLogLevel.ERROR, e);
            TRACER.debugCaught(DebugLogLevel.ERROR, e);
          }
        }
      }
@@ -423,7 +428,7 @@
      {
        if (debugEnabled())
        {
          debugCaught(DebugLogLevel.ERROR, e);
          TRACER.debugCaught(DebugLogLevel.ERROR, e);
        }
      }

@@ -435,7 +440,7 @@
      {
        if (debugEnabled())
        {
          debugCaught(DebugLogLevel.ERROR, e);
          TRACER.debugCaught(DebugLogLevel.ERROR, e);
        }
      }
    }
@@ -519,7 +524,7 @@
        {
          if (debugEnabled())
          {
            debugCaught(DebugLogLevel.ERROR, e);
            TRACER.debugCaught(DebugLogLevel.ERROR, e);
          }
        }
      }
@@ -536,7 +541,7 @@
    {
      if (debugEnabled())
      {
        debugCaught(DebugLogLevel.ERROR, e);
        TRACER.debugCaught(DebugLogLevel.ERROR, e);
      }
    }
  }