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/TLSConnectionSecurityProvider.java | 72 +++++++++++++++--------------------
1 files changed, 31 insertions(+), 41 deletions(-)
diff --git a/opends/src/server/org/opends/server/extensions/TLSConnectionSecurityProvider.java b/opends/src/server/org/opends/server/extensions/TLSConnectionSecurityProvider.java
index 4dc1a09..b2507ca 100644
--- a/opends/src/server/org/opends/server/extensions/TLSConnectionSecurityProvider.java
+++ b/opends/src/server/org/opends/server/extensions/TLSConnectionSecurityProvider.java
@@ -52,7 +52,9 @@
import org.opends.server.types.SSLClientAuthPolicy;
import org.opends.server.util.SelectableCertificateKeyManager;
-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.StaticUtils.*;
@@ -69,12 +71,6 @@
public class TLSConnectionSecurityProvider
extends ConnectionSecurityProvider
{
- /**
- * The fully-qualified name of this class for debugging purposes.
- */
- private static final String CLASS_NAME =
- "org.opends.server.extensions.TLSConnectionSecurityProvider";
-
/**
@@ -140,7 +136,6 @@
{
super();
- assert debugConstructor(CLASS_NAME);
}
@@ -165,7 +160,6 @@
{
super();
- assert debugConstructor(CLASS_NAME, String.valueOf(clientConnection));
this.clientConnection = clientConnection;
this.socketChannel = socketChannel;
@@ -212,8 +206,10 @@
}
catch (Exception e)
{
- assert debugException(CLASS_NAME, "initializeConnectionSecurityProvider",
- e);
+ if (debugEnabled())
+ {
+ debugCought(DebugLogLevel.ERROR, e);
+ }
int msgID = MSGID_TLS_SECURITY_PROVIDER_CANNOT_INITIALIZE;
String message = getMessage(msgID, stackTraceToSingleLineString(e));
@@ -292,8 +288,6 @@
public void initializeConnectionSecurityProvider(ConfigEntry configEntry)
throws ConfigException, InitializationException
{
- assert debugEnter(CLASS_NAME, "initializeConnectionSecurityProvider",
- String.valueOf(configEntry));
// Initialize default values for the connection-specific variables.
clientConnection = null;
@@ -321,7 +315,6 @@
*/
public void finalizeConnectionSecurityProvider()
{
- assert debugEnter(CLASS_NAME, "finalizeConnectionSecurityProvider");
// No implementation is required.
}
@@ -335,7 +328,6 @@
*/
public String getSecurityMechanismName()
{
- assert debugEnter(CLASS_NAME, "getSecurityMechanismName");
return SSL_CONTEXT_INSTANCE_NAME;
}
@@ -352,7 +344,6 @@
*/
public boolean isSecure()
{
- assert debugEnter(CLASS_NAME, "isSecure");
// This should be considered secure.
return true;
@@ -381,9 +372,6 @@
SocketChannel socketChannel)
throws DirectoryException
{
- assert debugEnter(CLASS_NAME, "newInstance",
- String.valueOf(clientConnection),
- String.valueOf(socketChannel));
return new TLSConnectionSecurityProvider(clientConnection, socketChannel,
this);
@@ -408,7 +396,6 @@
*/
public void disconnect(boolean connectionValid)
{
- assert debugEnter(CLASS_NAME, "disconnect");
if (connectionValid)
{
@@ -471,7 +458,10 @@
}
catch (Exception e)
{
- assert debugException(CLASS_NAME, "disconnect", e);
+ if (debugEnabled())
+ {
+ debugCought(DebugLogLevel.ERROR, e);
+ }
}
}
}
@@ -488,7 +478,6 @@
*/
public int getClearBufferSize()
{
- assert debugEnter(CLASS_NAME, "getClearBufferSize");
return clearBufferSize;
}
@@ -505,7 +494,6 @@
*/
public int getEncodedBufferSize()
{
- assert debugEnter(CLASS_NAME, "getEncodedBufferSize");
return sslBufferSize;
}
@@ -527,7 +515,6 @@
*/
public boolean readData()
{
- assert debugEnter(CLASS_NAME, "readData");
while (true)
@@ -662,7 +649,10 @@
}
catch (IOException ioe)
{
- assert debugException(CLASS_NAME, "readData", ioe);
+ if (debugEnabled())
+ {
+ debugCought(DebugLogLevel.ERROR, ioe);
+ }
// An error occurred while trying to communicate with the client.
// Disconnect and return.
@@ -671,7 +661,10 @@
}
catch (Exception e)
{
- assert debugException(CLASS_NAME, "readData", e);
+ if (debugEnabled())
+ {
+ debugCought(DebugLogLevel.ERROR, e);
+ }
// An unexpected error occurred while trying to process the data read.
// Disconnect and return.
@@ -705,7 +698,6 @@
*/
public boolean writeData(ByteBuffer clearData)
{
- assert debugEnter(CLASS_NAME, "writeData", "java.nio.ByteBuffer");
int originalPosition = clearData.position();
int originalLimit = clearData.limit();
@@ -958,7 +950,10 @@
}
catch (IOException ioe)
{
- assert debugException(CLASS_NAME, "writeData", ioe);
+ if (debugEnabled())
+ {
+ debugCought(DebugLogLevel.ERROR, ioe);
+ }
// An error occurred while trying to communicate with the client.
// Disconnect and return.
@@ -967,7 +962,10 @@
}
catch (Exception e)
{
- assert debugException(CLASS_NAME, "writeData", e);
+ if (debugEnabled())
+ {
+ debugCought(DebugLogLevel.ERROR, e);
+ }
// An unexpected error occurred while trying to process the data read.
// Disconnect and return.
@@ -988,7 +986,6 @@
*/
public String[] getEnabledProtocols()
{
- assert debugEnter(CLASS_NAME, "getEnabledProtocols");
return enabledProtocols;
}
@@ -1004,8 +1001,6 @@
*/
public void setEnabledProtocols(String[] enabledProtocols)
{
- assert debugEnter(CLASS_NAME, "setEnabledProtocols",
- String.valueOf(enabledProtocols));
this.enabledProtocols = enabledProtocols;
}
@@ -1019,7 +1014,6 @@
*/
public String[] getEnabledCipherSuites()
{
- assert debugEnter(CLASS_NAME, "getEnabledCipherSuites");
return enabledCipherSuites;
}
@@ -1034,8 +1028,6 @@
*/
public void setEnabledCipherSuites(String[] enabledCipherSuites)
{
- assert debugEnter(CLASS_NAME, "setEnabledCipherSuites",
- String.valueOf(enabledCipherSuites));
this.enabledCipherSuites = enabledCipherSuites;
}
@@ -1049,7 +1041,6 @@
*/
public SSLClientAuthPolicy getSSLClientAuthPolicy()
{
- assert debugEnter(CLASS_NAME, "getSSLClientAuthPolicy");
return sslClientAuthPolicy;
}
@@ -1064,8 +1055,6 @@
*/
public void setSSLClientAuthPolicy(SSLClientAuthPolicy sslClientAuthPolicy)
{
- assert debugEnter(CLASS_NAME, "setSSLClientAuthPolicy",
- String.valueOf(sslClientAuthPolicy));
this.sslClientAuthPolicy = sslClientAuthPolicy;
}
@@ -1079,7 +1068,6 @@
*/
public SSLSession getSSLSession()
{
- assert debugEnter(CLASS_NAME, "getSSLSession");
return sslEngine.getSession();
}
@@ -1097,7 +1085,6 @@
*/
public Certificate[] getClientCertificateChain()
{
- assert debugEnter(CLASS_NAME, "getClientCertificateChain");
try
{
@@ -1105,7 +1092,10 @@
}
catch (Exception e)
{
- assert debugException(CLASS_NAME, "getClientCertificateChain", e);
+ if (debugEnabled())
+ {
+ debugCought(DebugLogLevel.ERROR, e);
+ }
return null;
}
--
Gitblit v1.10.0