From 92763bf06494952b24b13915d71aa541bf590ffc Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Mon, 25 Mar 2013 11:04:10 +0000
Subject: [PATCH] Simple fix: avoid appending redundant ":" to ErrorResultException error message when there is no LDAP diagnostic message.
---
opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/ErrorResultException.java | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/ErrorResultException.java b/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/ErrorResultException.java
index be4274d..4444d3b 100644
--- a/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/ErrorResultException.java
+++ b/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/ErrorResultException.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2009-2010 Sun Microsystems, Inc.
- * Portions copyright 2011-2012 ForgeRock AS.
+ * Portions copyright 2011-2013 ForgeRock AS.
*/
package org.forgerock.opendj.ldap;
@@ -184,6 +184,14 @@
return new ErrorResultException(result);
}
+ private static String getMessage(final Result result) {
+ if (result.getDiagnosticMessage() == null || result.getDiagnosticMessage().isEmpty()) {
+ return result.getResultCode().toString();
+ } else {
+ return result.getResultCode() + ": " + result.getDiagnosticMessage();
+ }
+ }
+
private final Result result;
/**
@@ -193,7 +201,7 @@
* The error result.
*/
protected ErrorResultException(final Result result) {
- super(result.getResultCode() + ": " + result.getDiagnosticMessage(), result.getCause());
+ super(getMessage(result), result.getCause());
this.result = result;
}
--
Gitblit v1.10.0