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-sdk/src/main/java/org/forgerock/opendj/ldap/AbstractConnection.java |   37 +++++++++++++++----------------------
 1 files changed, 15 insertions(+), 22 deletions(-)

diff --git a/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/AbstractConnection.java b/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/AbstractConnection.java
index 00a384c..fa14670 100644
--- a/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/AbstractConnection.java
+++ b/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/AbstractConnection.java
@@ -217,7 +217,7 @@
      * {@inheritDoc}
      */
     @Override
-    public Result add(final Entry entry) throws ErrorResultException, InterruptedException {
+    public Result add(final Entry entry) throws ErrorResultException {
         return add(Requests.newAddRequest(entry));
     }
 
@@ -225,7 +225,7 @@
      * {@inheritDoc}
      */
     @Override
-    public Result add(final String... ldifLines) throws ErrorResultException, InterruptedException {
+    public Result add(final String... ldifLines) throws ErrorResultException {
         return add(Requests.newAddRequest(ldifLines));
     }
 
@@ -233,8 +233,7 @@
      * {@inheritDoc}
      */
     @Override
-    public BindResult bind(final String name, final char[] password) throws ErrorResultException,
-            InterruptedException {
+    public BindResult bind(final String name, final char[] password) throws ErrorResultException {
         return bind(Requests.newSimpleBindRequest(name, password));
     }
 
@@ -251,7 +250,7 @@
      */
     @Override
     public CompareResult compare(final String name, final String attributeDescription,
-            final String assertionValue) throws ErrorResultException, InterruptedException {
+            final String assertionValue) throws ErrorResultException {
         return compare(Requests.newCompareRequest(name, attributeDescription, assertionValue));
     }
 
@@ -259,7 +258,7 @@
      * {@inheritDoc}
      */
     @Override
-    public Result delete(final String name) throws ErrorResultException, InterruptedException {
+    public Result delete(final String name) throws ErrorResultException {
         return delete(Requests.newDeleteRequest(name));
     }
 
@@ -268,7 +267,7 @@
      */
     @Override
     public <R extends ExtendedResult> R extendedRequest(final ExtendedRequest<R> request)
-            throws ErrorResultException, InterruptedException {
+            throws ErrorResultException {
         return extendedRequest(request, null);
     }
 
@@ -277,7 +276,7 @@
      */
     @Override
     public GenericExtendedResult extendedRequest(final String requestName,
-            final ByteString requestValue) throws ErrorResultException, InterruptedException {
+            final ByteString requestValue) throws ErrorResultException {
         return extendedRequest(Requests.newGenericExtendedRequest(requestName, requestValue));
     }
 
@@ -285,8 +284,7 @@
      * {@inheritDoc}
      */
     @Override
-    public Result modify(final String... ldifLines) throws ErrorResultException,
-            InterruptedException {
+    public Result modify(final String... ldifLines) throws ErrorResultException {
         return modify(Requests.newModifyRequest(ldifLines));
     }
 
@@ -294,8 +292,7 @@
      * {@inheritDoc}
      */
     @Override
-    public Result modifyDN(final String name, final String newRDN) throws ErrorResultException,
-            InterruptedException {
+    public Result modifyDN(final String name, final String newRDN) throws ErrorResultException {
         return modifyDN(Requests.newModifyDNRequest(name, newRDN));
     }
 
@@ -304,7 +301,7 @@
      */
     @Override
     public SearchResultEntry readEntry(final DN baseObject, final String... attributeDescriptions)
-            throws ErrorResultException, InterruptedException {
+            throws ErrorResultException {
         final SearchRequest request =
                 Requests.newSearchRequest(baseObject, SearchScope.BASE_OBJECT, Filter
                         .getObjectClassPresentFilter(), attributeDescriptions);
@@ -316,8 +313,7 @@
      */
     @Override
     public SearchResultEntry readEntry(final String baseObject,
-            final String... attributeDescriptions) throws ErrorResultException,
-            InterruptedException {
+            final String... attributeDescriptions) throws ErrorResultException {
         return readEntry(DN.valueOf(baseObject));
     }
 
@@ -350,8 +346,7 @@
      */
     @Override
     public Result search(final SearchRequest request,
-            final Collection<? super SearchResultEntry> entries) throws ErrorResultException,
-            InterruptedException {
+            final Collection<? super SearchResultEntry> entries) throws ErrorResultException {
         return search(request, entries, null);
     }
 
@@ -361,8 +356,7 @@
     @Override
     public Result search(final SearchRequest request,
             final Collection<? super SearchResultEntry> entries,
-            final Collection<? super SearchResultReference> references)
-            throws ErrorResultException, InterruptedException {
+            final Collection<? super SearchResultReference> references) throws ErrorResultException {
         Validator.ensureNotNull(request, entries);
 
         // FIXME: does this need to be thread safe?
@@ -418,7 +412,7 @@
      */
     @Override
     public SearchResultEntry searchSingleEntry(final SearchRequest request)
-            throws ErrorResultException, InterruptedException {
+            throws ErrorResultException {
         final SingleEntryHandler handler = new SingleEntryHandler();
         search(request, handler);
 
@@ -445,8 +439,7 @@
      */
     @Override
     public SearchResultEntry searchSingleEntry(final String baseObject, final SearchScope scope,
-            final String filter, final String... attributeDescriptions)
-            throws ErrorResultException, InterruptedException {
+            final String filter, final String... attributeDescriptions) throws ErrorResultException {
         final SearchRequest request =
                 Requests.newSearchRequest(baseObject, scope, filter, attributeDescriptions);
         return searchSingleEntry(request);

--
Gitblit v1.10.0