From 02309396d121143130dd954ee13092bb10f8e250 Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Mon, 11 Feb 2013 17:24:28 +0000
Subject: [PATCH] Fix OPENDJ-729: ArrayIndexOutOfBoundsException when attempting to search using SSL with SASL/EXTERNAL
---
opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/com/forgerock/opendj/ldap/LDAPConnectionFactoryImpl.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/com/forgerock/opendj/ldap/LDAPConnectionFactoryImpl.java b/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/com/forgerock/opendj/ldap/LDAPConnectionFactoryImpl.java
index 8810941..46f965f 100644
--- a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/com/forgerock/opendj/ldap/LDAPConnectionFactoryImpl.java
+++ b/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/com/forgerock/opendj/ldap/LDAPConnectionFactoryImpl.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2010 Sun Microsystems, Inc.
- * Portions copyright 2011-2012 ForgeRock AS
+ * Portions copyright 2011-2013 ForgeRock AS
*/
package com.forgerock.opendj.ldap;
@@ -156,8 +156,8 @@
}
private ErrorResultException adaptConnectionException(Throwable t) {
- if (t instanceof ExecutionException) {
- t = t.getCause();
+ if (!(t instanceof ErrorResultException) && t instanceof ExecutionException) {
+ t = t.getCause() != null ? t.getCause() : t;
}
if (t instanceof ErrorResultException) {
--
Gitblit v1.10.0