From 4ef0902304712f39cf5a4374fe81c2d52afac7c9 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Wed, 05 Feb 2014 15:39:41 +0000
Subject: [PATCH] OPENDJ-1307 Migrate server ASN1 classes to SDK
---
opendj-sdk/opendj-grizzly/src/main/java/org/forgerock/opendj/grizzly/GrizzlyLDAPConnection.java | 15 +++++++--------
1 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/opendj-sdk/opendj-grizzly/src/main/java/org/forgerock/opendj/grizzly/GrizzlyLDAPConnection.java b/opendj-sdk/opendj-grizzly/src/main/java/org/forgerock/opendj/grizzly/GrizzlyLDAPConnection.java
index 55de201..591a660 100644
--- a/opendj-sdk/opendj-grizzly/src/main/java/org/forgerock/opendj/grizzly/GrizzlyLDAPConnection.java
+++ b/opendj-sdk/opendj-grizzly/src/main/java/org/forgerock/opendj/grizzly/GrizzlyLDAPConnection.java
@@ -24,13 +24,9 @@
* Copyright 2010 Sun Microsystems, Inc.
* Portions Copyright 2011-2014 ForgeRock AS
*/
-
package org.forgerock.opendj.grizzly;
-import static com.forgerock.opendj.grizzly.GrizzlyMessages.LDAP_CONNECTION_BIND_OR_START_TLS_CONNECTION_TIMEOUT;
-import static com.forgerock.opendj.grizzly.GrizzlyMessages.LDAP_CONNECTION_BIND_OR_START_TLS_REQUEST_TIMEOUT;
-import static com.forgerock.opendj.grizzly.GrizzlyMessages.LDAP_CONNECTION_REQUEST_TIMEOUT;
-import static com.forgerock.opendj.util.StaticUtils.DEFAULT_LOG;
+import static com.forgerock.opendj.grizzly.GrizzlyMessages.*;
import static org.forgerock.opendj.ldap.ErrorResultException.newErrorResult;
import java.io.IOException;
@@ -45,6 +41,8 @@
import javax.net.ssl.SSLContext;
import javax.net.ssl.SSLEngine;
+import org.forgerock.i18n.LocalizableMessage;
+import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.forgerock.opendj.io.LDAPWriter;
import org.forgerock.opendj.ldap.AbstractAsynchronousConnection;
import org.forgerock.opendj.ldap.ConnectionEventListener;
@@ -114,6 +112,7 @@
}
}
+ private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
private final AtomicBoolean bindOrStartTLSInProgress = new AtomicBoolean(false);
private final org.glassfish.grizzly.Connection<?> connection;
private final AtomicInteger nextMsgID = new AtomicInteger(1);
@@ -613,8 +612,8 @@
* invalidating the connection. We'll do the latter, since
* ignoring timeouts could cause the application to hang.
*/
- DEFAULT_LOG.debug("Failing bind or StartTLS request due to timeout "
- + "(connection will be invalidated): " + future);
+ logger.debug(LocalizableMessage.raw("Failing bind or StartTLS request due to timeout %s"
+ + "(connection will be invalidated): ", future));
final Result result =
Responses.newResult(ResultCode.CLIENT_SIDE_TIMEOUT).setDiagnosticMessage(
LDAP_CONNECTION_BIND_OR_START_TLS_REQUEST_TIMEOUT.get(timeout)
@@ -628,7 +627,7 @@
.toString());
connectionErrorOccurred(errorResult);
} else {
- DEFAULT_LOG.debug("Failing request due to timeout: " + future);
+ logger.debug(LocalizableMessage.raw("Failing request due to timeout: %s", future));
final Result result =
Responses.newResult(ResultCode.CLIENT_SIDE_TIMEOUT).setDiagnosticMessage(
LDAP_CONNECTION_REQUEST_TIMEOUT.get(timeout).toString());
--
Gitblit v1.10.0