From f134ef63e016bf13b70bef1ec277603b8a9a6f21 Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Wed, 25 Apr 2012 11:06:50 +0000
Subject: [PATCH] Fix OPENDJ-474: Remove requirement for clients to deal with InterruptedExceptions in synchronous APIs
---
opendj3/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDAPPasswordModify.java | 17 ++---------------
1 files changed, 2 insertions(+), 15 deletions(-)
diff --git a/opendj3/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDAPPasswordModify.java b/opendj3/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDAPPasswordModify.java
index 17b2cef..22762e6 100644
--- a/opendj3/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDAPPasswordModify.java
+++ b/opendj3/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDAPPasswordModify.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2010 Sun Microsystems, Inc.
- * Portions copyright 2011 ForgeRock AS
+ * Portions copyright 2011-2012 ForgeRock AS
*/
package com.forgerock.opendj.ldap.tools;
@@ -30,7 +30,6 @@
import static com.forgerock.opendj.ldap.tools.ToolConstants.*;
import static com.forgerock.opendj.ldap.tools.ToolsMessages.*;
import static com.forgerock.opendj.ldap.tools.Utils.filterExitCode;
-import static org.forgerock.opendj.ldap.ErrorResultException.newErrorResult;
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.opendj.ldap.ByteString;
@@ -249,11 +248,6 @@
connection = connectionFactory.getConnection();
} catch (final ErrorResultException ere) {
return Utils.printErrorMessage(this, ere);
- } catch (final InterruptedException e) {
- // This shouldn't happen because there are no other threads to
- // interrupt this one.
- println(LocalizableMessage.raw(e.getLocalizedMessage()));
- return ResultCode.CLIENT_SIDE_USER_CANCELLED.intValue();
}
if (proxyAuthzID.isPresent()) {
@@ -274,14 +268,7 @@
PasswordModifyExtendedResult result;
try {
- try {
- result = connection.extendedRequest(request);
- } catch (final InterruptedException e) {
- // This shouldn't happen because there are no other threads to
- // interrupt this one.
- throw newErrorResult(ResultCode.CLIENT_SIDE_USER_CANCELLED,
- e.getLocalizedMessage(), e);
- }
+ result = connection.extendedRequest(request);
} catch (final ErrorResultException e) {
LocalizableMessage message =
ERR_LDAPPWMOD_FAILED.get(e.getResult().getResultCode().intValue(), e
--
Gitblit v1.10.0