Checkpoint commit for OPENDJ-1536: Rename ErrorResultException to LdapExcep...

Gaetan Boismal

19.56.2014 d94f6d23898f7515e969517f85b8e626667a1e02

 opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/PerformanceRunner.java

@@ -22,7 +22,7 @@
 *
 *
 *      Copyright 2010 Sun Microsystems, Inc.
 *      Portions copyright 2011-2014 ForgeRock AS.
 *      Portions Copyright 2011-2014 ForgeRock AS.
 */
package com.forgerock.opendj.ldap.tools;

@@ -42,7 +42,7 @@
import org.forgerock.opendj.ldap.Connection;
import org.forgerock.opendj.ldap.ConnectionEventListener;
import org.forgerock.opendj.ldap.ConnectionFactory;
import org.forgerock.opendj.ldap.ErrorResultException;
import org.forgerock.opendj.ldap.LdapException;
import org.forgerock.opendj.ldap.ResultHandler;
import org.forgerock.opendj.ldap.responses.ExtendedResult;
import org.forgerock.opendj.ldap.responses.Result;
@@ -371,7 +371,7 @@
        }

        @Override
        public void handleError(final ErrorResultException error) {
        public void handleError(final LdapException error) {
            failedRecentCount.getAndIncrement();
            updateStats();
            app.errPrintVerboseMessage(LocalizableMessage.raw(error.getResult().toString()));
@@ -411,12 +411,12 @@
            this.connectionFactory = connectionFactory;
        }

        public abstract Promise<?, ErrorResultException> performOperation(Connection connection,
        public abstract Promise<?, LdapException> performOperation(Connection connection,
                DataSource[] dataSources, long startTime);

        @Override
        public void run() {
            Promise<?, ErrorResultException> promise;
            Promise<?, LdapException> promise;
            Connection connection;

            final double targetTimeInMS = 1000.0 / (targetThroughput / (double) (numThreads * numConnections));
@@ -429,7 +429,7 @@
                    } catch (final InterruptedException e) {
                        // Ignore and check stop requested
                        continue;
                    } catch (final ErrorResultException e) {
                    } catch (final LdapException e) {
                        app.errPrintln(LocalizableMessage.raw(e.getResult().getDiagnosticMessage()));
                        if (e.getCause() != null && app.isVerbose()) {
                            e.getCause().printStackTrace(app.getErrorStream());
@@ -446,7 +446,7 @@
                        } catch (final InterruptedException e) {
                            // Ignore and check stop requested
                            continue;
                        } catch (final ErrorResultException e) {
                        } catch (final LdapException e) {
                            app.errPrintln(LocalizableMessage.raw(e.getResult().toString()));
                            if (e.getCause() != null && app.isVerbose()) {
                                e.getCause().printStackTrace(app.getErrorStream());
@@ -469,7 +469,7 @@
                    } catch (final InterruptedException e) {
                        // Ignore and check stop requested
                        continue;
                    } catch (final ErrorResultException e) {
                    } catch (final LdapException e) {
                        if (e.getCause() instanceof IOException) {
                            e.getCause().printStackTrace(app.getErrorStream());
                            stopRequested = true;
@@ -787,8 +787,7 @@
    }

    @Override
    public synchronized void handleConnectionError(final boolean isDisconnectNotification,
            final ErrorResultException error) {
    public synchronized void handleConnectionError(final boolean isDisconnectNotification, final LdapException error) {
        if (!stopRequested) {
            app.errPrintln(LocalizableMessage.raw("Error occurred on one or more connections: "
                    + error.getResult()));
@@ -891,7 +890,7 @@
            statsThread.join();
        } catch (final InterruptedException e) {
            stopRequested = true;
        } catch (final ErrorResultException e) {
        } catch (final LdapException e) {
            stopRequested = true;
            app.println(LocalizableMessage.raw(e.getResult().getDiagnosticMessage()));
        } finally {