From 4783adc14c2d6b96260052d3b634eafa500c6ddf 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.
---
opendj-sdk/opends/src/server/org/opends/server/protocols/jmx/DirectoryRMIServerSocketFactory.java | 25 ++++++++-----------------
1 files changed, 8 insertions(+), 17 deletions(-)
diff --git a/opendj-sdk/opends/src/server/org/opends/server/protocols/jmx/DirectoryRMIServerSocketFactory.java b/opendj-sdk/opends/src/server/org/opends/server/protocols/jmx/DirectoryRMIServerSocketFactory.java
index de4d3cc..9d2ed2c 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/protocols/jmx/DirectoryRMIServerSocketFactory.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/protocols/jmx/DirectoryRMIServerSocketFactory.java
@@ -22,11 +22,12 @@
* CDDL HEADER END
*
*
- * Portions Copyright 2006 Sun Microsystems, Inc.
+ * Portions Copyright 2006-2007 Sun Microsystems, Inc.
*/
package org.opends.server.protocols.jmx;
-import static org.opends.server.loggers.Debug.debugMessage;
+import static org.opends.server.loggers.debug.DebugLogger.debugEnabled;
+import static org.opends.server.loggers.debug.DebugLogger.debugVerbose;
import java.io.IOException;
import java.net.InetAddress;
@@ -37,9 +38,6 @@
import javax.net.ssl.SSLSocket;
import javax.net.ssl.SSLSocketFactory;
-import org.opends.server.types.DebugLogCategory;
-import org.opends.server.types.DebugLogSeverity;
-
/**
* A <code>DirectoryRMIServerSocketFactory</code> instance is used by the RMI
* runtime in order to obtain server sockets for RMI calls via SSL.
@@ -62,11 +60,6 @@
*/
private final boolean needClientCertificate;
- /**
- * The fully-qualified name of this class for debugging purposes.
- */
- private static final String CLASS_NAME =
- "org.opends.server.protocols.jmx.DirectoryRMIServerSocketFactory";
/**
* Constructs a new <code>DirectoryRMIServerSocketFactory</code> with the
@@ -125,13 +118,11 @@
public Socket accept() throws IOException
{
Socket socket = super.accept();
- assert debugMessage(
- DebugLogCategory.CONNECTION_HANDLING,
- DebugLogSeverity.VERBOSE,
- CLASS_NAME,
- "createServerSocket",
- "host/port:" + socket.getInetAddress().getHostName() + "/"
- + socket.getPort());
+ if (debugEnabled())
+ {
+ debugVerbose("host/port: %s/%d",
+ socket.getInetAddress().getHostName(), socket.getPort());
+ }
SSLSocket sslSocket = (SSLSocket) sslSocketFactory.createSocket(
socket,
socket.getInetAddress().getHostName(),
--
Gitblit v1.10.0