From 7d1bbf9b372e41121198be2b9f0f322d58b8d014 Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Wed, 18 Sep 2013 16:28:59 +0000
Subject: [PATCH] Backport fix for OPENDJ-1058 – HeartbeatConnectionFactory does not actively shutdown dead connections
---
opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/ErrorResultException.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/ErrorResultException.java b/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/ErrorResultException.java
index e9cf922..45949d3 100644
--- a/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/ErrorResultException.java
+++ b/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/ErrorResultException.java
@@ -72,7 +72,7 @@
* If {@code resultCode} was {@code null}.
*/
public static ErrorResultException newErrorResult(ResultCode resultCode,
- String diagnosticMessage) {
+ CharSequence diagnosticMessage) {
return newErrorResult(resultCode, diagnosticMessage, null);
}
@@ -114,10 +114,10 @@
* If {@code resultCode} was {@code null}.
*/
public static ErrorResultException newErrorResult(ResultCode resultCode,
- String diagnosticMessage, Throwable cause) {
+ CharSequence diagnosticMessage, Throwable cause) {
final Result result = Responses.newResult(resultCode);
if (diagnosticMessage != null) {
- result.setDiagnosticMessage(diagnosticMessage);
+ result.setDiagnosticMessage(diagnosticMessage.toString());
} else if (cause != null) {
result.setDiagnosticMessage(cause.getLocalizedMessage());
}
--
Gitblit v1.10.0