AutoRefactor'ed Use multi-catch

Jean-Noel Rouvignac

18.52.2015 4c8bc7a02ea31502fc082cb343ef53c500f5176b

AutoRefactor'ed Use multi-catch

 opendj-sdk/opendj-server-legacy/src/dsml/org/opends/dsml/protocol/DSMLServlet.java

@@ -289,17 +289,7 @@
        }
      } while (true);
    }
    catch (LDAPException le)
    {
      LocalizableMessage m = INFO_RESULT_CLIENT_SIDE_ENCODING_ERROR.get();
      throw new LDAPConnectionException(m, CLIENT_SIDE_CONNECT_ERROR, null, le);
    }
    catch (DecodeException ae)
    {
      LocalizableMessage m = INFO_RESULT_CLIENT_SIDE_ENCODING_ERROR.get();
      throw new LDAPConnectionException(m, CLIENT_SIDE_CONNECT_ERROR, null, ae);
    }
    catch (IOException ie)
    catch (LDAPException | IOException ie)
    {
      LocalizableMessage m = INFO_RESULT_CLIENT_SIDE_ENCODING_ERROR.get();
      throw new LDAPConnectionException(m, CLIENT_SIDE_CONNECT_ERROR, null, ie);
@@ -659,15 +649,7 @@

      xmlReader.parse(new InputSource(is));
    }
    catch (ParserConfigurationException e)
    {
      // ignore
    }
    catch (SAXException e)
    {
      // ignore
    }
    catch (IOException e)
    catch (ParserConfigurationException | SAXException | IOException e)
    {
      // ignore
    }

 opendj-sdk/opendj-server-legacy/src/main/java/org/opends/server/admin/client/ldap/JNDIDirContextAdaptor.java

@@ -22,7 +22,7 @@
 *
 *
 *      Copyright 2008-2010 Sun Microsystems, Inc.
 *      Portions Copyright 2013-2014 ForgeRock AS
 *      Portions Copyright 2013-2015 ForgeRock AS
 */
package org.opends.server.admin.client.ldap;

@@ -153,8 +153,6 @@
    DirContext ctx;
    try {
      ctx = new InitialLdapContext(env, null);
    } catch (javax.naming.CommunicationException e) {
      throw new CommunicationException(e);
    } catch (javax.naming.AuthenticationException e) {
      throw new AuthenticationException(e);
    } catch (javax.naming.AuthenticationNotSupportedException e) {

 opendj-sdk/opendj-server-legacy/src/main/java/org/opends/server/admin/client/ldap/LDAPDriver.java

@@ -498,10 +498,6 @@
      AuthorizationException {
    try {
      throw ne;
    } catch (javax.naming.CommunicationException e) {
      throw new CommunicationException(e);
    } catch (javax.naming.ServiceUnavailableException e) {
      throw new CommunicationException(e);
    } catch (javax.naming.NoPermissionException e) {
      throw new AuthorizationException(e);
    } catch (NamingException e) {

 opendj-sdk/opendj-server-legacy/src/main/java/org/opends/server/backends/SchemaBackend.java

@@ -3785,10 +3785,6 @@
              }
            }
          }
          catch (DirectoryException de)
          {
            logger.info(NOTE_SCHEMA_IMPORT_FAILED, attrType, de.getMessage());
          }
          catch (Exception e)
          {
            logger.info(NOTE_SCHEMA_IMPORT_FAILED, attrType, e.getMessage());
@@ -3894,10 +3890,6 @@
              }
            }
          }
          catch (DirectoryException de)
          {
            logger.info(NOTE_SCHEMA_IMPORT_FAILED, newObjectClass, de.getMessage());
          }
          catch (Exception e)
          {
            logger.info(NOTE_SCHEMA_IMPORT_FAILED, newObjectClass, e.getMessage());

 opendj-sdk/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/BackendImpl.java

@@ -775,20 +775,10 @@
      logger.traceException(intEx);
      throw new DirectoryException(errorRC, ERR_INTERRUPTED_ERROR.get(intEx.getMessage()));
    }
    catch (JebException je)
    catch (JebException | InitializationException | ConfigException e)
    {
      logger.traceException(je);
      throw new DirectoryException(errorRC, je.getMessageObject());
    }
    catch (InitializationException ie)
    {
      logger.traceException(ie);
      throw new DirectoryException(errorRC, ie.getMessageObject());
    }
    catch (ConfigException ce)
    {
      logger.traceException(ce);
      throw new DirectoryException(errorRC, ce.getMessageObject());
      logger.traceException(e);
      throw new DirectoryException(errorRC, e.getMessageObject());
    }
    finally
    {
@@ -912,12 +902,7 @@
      logger.traceException(intEx);
      throw new DirectoryException(errorRC, ERR_INTERRUPTED_ERROR.get(intEx.getMessage()));
    }
    catch (ConfigException ce)
    {
      logger.traceException(ce);
      throw new DirectoryException(errorRC, ce.getMessageObject());
    }
    catch (JebException e)
    catch (ConfigException | JebException e)
    {
      logger.traceException(e);
      throw new DirectoryException(errorRC, e.getMessageObject());

 opendj-sdk/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/EntryContainer.java

@@ -1522,20 +1522,10 @@
        entryCache.putEntry(entry, backend, entryID.longValue());
      }
    }
    catch (DatabaseException databaseException)
    catch (DatabaseException | DirectoryException | CanceledOperationException e)
    {
      EntryContainer.transactionAbort(txn);
      throw databaseException;
    }
    catch (DirectoryException directoryException)
    {
      EntryContainer.transactionAbort(txn);
      throw directoryException;
    }
    catch (CanceledOperationException coe)
    {
      EntryContainer.transactionAbort(txn);
      throw coe;
      throw e;
    }
    catch (Exception e)
    {
@@ -1711,20 +1701,10 @@
                subordinateEntriesDeleted + 1));
      }
    }
    catch (DatabaseException databaseException)
    catch (DatabaseException | DirectoryException | CanceledOperationException e)
    {
      EntryContainer.transactionAbort(txn);
      throw databaseException;
    }
    catch (DirectoryException directoryException)
    {
      EntryContainer.transactionAbort(txn);
      throw directoryException;
    }
    catch (CanceledOperationException coe)
    {
      EntryContainer.transactionAbort(txn);
      throw coe;
      throw e;
    }
    catch (Exception e)
    {
@@ -1995,20 +1975,10 @@
        entryCache.putEntry(newEntry, backend, entryID.longValue());
      }
    }
    catch (DatabaseException databaseException)
    catch (DatabaseException | DirectoryException | CanceledOperationException e)
    {
      EntryContainer.transactionAbort(txn);
      throw databaseException;
    }
    catch (DirectoryException directoryException)
    {
      EntryContainer.transactionAbort(txn);
      throw directoryException;
    }
    catch (CanceledOperationException coe)
    {
      EntryContainer.transactionAbort(txn);
      throw coe;
      throw e;
    }
    catch (Exception e)
    {
@@ -2261,20 +2231,10 @@
      // Commit the transaction.
      EntryContainer.transactionCommit(txn);
    }
    catch (DatabaseException databaseException)
    catch (DatabaseException | DirectoryException | CanceledOperationException e)
    {
      EntryContainer.transactionAbort(txn);
      throw databaseException;
    }
    catch (DirectoryException directoryException)
    {
      EntryContainer.transactionAbort(txn);
      throw directoryException;
    }
    catch (CanceledOperationException coe)
    {
      EntryContainer.transactionAbort(txn);
      throw coe;
      throw e;
    }
    catch (Exception e)
    {

 opendj-sdk/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/VerifyJob.java

@@ -1420,17 +1420,7 @@
        }
        errorCount++;
      }
      catch (DatabaseException e)
      {
        if (logger.isTraceEnabled())
        {
          logger.traceException(e);
          logger.trace("Error reading VLV index %s for entry %s: %s",
              vlvIndex.getName(), entry.getName(), StaticUtils.getBacktrace(e));
        }
        errorCount++;
      }
      catch (JebException e)
      catch (DatabaseException | JebException e)
      {
        if (logger.isTraceEnabled())
        {

 opendj-sdk/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/EntryContainer.java

@@ -1532,17 +1532,9 @@
              entryCache.putEntry(entry, backend, entryID.longValue());
            }
          }
          catch (StorageRuntimeException StorageRuntimeException)
          catch (StorageRuntimeException | DirectoryException | CanceledOperationException e)
          {
            throw StorageRuntimeException;
          }
          catch (DirectoryException directoryException)
          {
            throw directoryException;
          }
          catch (CanceledOperationException coe)
          {
            throw coe;
            throw e;
          }
          catch (Exception e)
          {
@@ -1696,17 +1688,9 @@
                  subordinateEntriesDeleted + 1));
            }
          }
          catch (StorageRuntimeException StorageRuntimeException)
          catch (StorageRuntimeException | DirectoryException | CanceledOperationException e)
          {
            throw StorageRuntimeException;
          }
          catch (DirectoryException directoryException)
          {
            throw directoryException;
          }
          catch (CanceledOperationException coe)
          {
            throw coe;
            throw e;
          }
          catch (Exception e)
          {
@@ -2004,17 +1988,9 @@
              entryCache.putEntry(newEntry, backend, entryID.longValue());
            }
          }
          catch (StorageRuntimeException StorageRuntimeException)
          catch (StorageRuntimeException | DirectoryException | CanceledOperationException e)
          {
            throw StorageRuntimeException;
          }
          catch (DirectoryException directoryException)
          {
            throw directoryException;
          }
          catch (CanceledOperationException coe)
          {
            throw coe;
            throw e;
          }
          catch (Exception e)
          {
@@ -2230,17 +2206,9 @@
              modifyDNOperation.checkIfCanceled(true);
            }
          }
          catch (StorageRuntimeException StorageRuntimeException)
          catch (StorageRuntimeException | DirectoryException | CanceledOperationException e)
          {
            throw StorageRuntimeException;
          }
          catch (DirectoryException directoryException)
          {
            throw directoryException;
          }
          catch (CanceledOperationException coe)
          {
            throw coe;
            throw e;
          }
          catch (Exception e)
          {

 opendj-sdk/opendj-server-legacy/src/main/java/org/opends/server/backends/task/TaskScheduler.java

@@ -1322,16 +1322,6 @@
            this, ALERT_TYPE_CANNOT_RENAME_NEW_TASK_FILE, message);
      }
    }
    catch (IOException ioe)
    {
      logger.traceException(ioe);
      LocalizableMessage message =
          ERR_TASKSCHED_CANNOT_WRITE_BACKING_FILE.get(tmpFilePath,
              stackTraceToSingleLineString(ioe));
      logger.error(message);
      DirectoryServer.sendAlertNotification(this,
                           ALERT_TYPE_CANNOT_WRITE_TASK_FILE, message);
    }
    catch (LDIFException le)
    {
      logger.traceException(le);

 opendj-sdk/opendj-server-legacy/src/main/java/org/opends/server/core/PasswordPolicyFactory.java

@@ -153,17 +153,10 @@
      {
        updateConfiguration(configuration, false);
      }
      catch (ConfigException ce)
      catch (ConfigException | InitializationException e)
      {
        LocalizableMessage message = ERR_CONFIG_PWPOLICY_INVALID_POLICY_CONFIG.get(
            configuration.dn(), ce.getMessage());
        unacceptableReasons.add(message);
        return false;
      }
      catch (InitializationException ie)
      {
        LocalizableMessage message = ERR_CONFIG_PWPOLICY_INVALID_POLICY_CONFIG.get(
            configuration.dn(), ie.getMessage());
            configuration.dn(), e.getMessage());
        unacceptableReasons.add(message);
        return false;
      }
@@ -1025,14 +1018,7 @@
    {
      new PasswordPolicyImpl(null, configuration);
    }
    catch (final ConfigException ce)
    {
      logger.traceException(ce);

      unacceptableReasons.add(ce.getMessageObject());
      return false;
    }
    catch (final InitializationException ie)
    catch (final ConfigException | InitializationException ie)
    {
      logger.traceException(ie);


 opendj-sdk/opendj-server-legacy/src/main/java/org/opends/server/extensions/DictionaryPasswordValidator.java

@@ -244,14 +244,9 @@
    {
      loadDictionary(configuration);
    }
    catch (ConfigException ce)
    catch (ConfigException | InitializationException e)
    {
      unacceptableReasons.add(ce.getMessageObject());
      return false;
    }
    catch (InitializationException ie)
    {
      unacceptableReasons.add(ie.getMessageObject());
      unacceptableReasons.add(e.getMessageObject());
      return false;
    }
    catch (Exception e)

 opendj-sdk/opendj-server-legacy/src/main/java/org/opends/server/extensions/NumSubordinatesVirtualAttributeProvider.java

@@ -119,12 +119,7 @@
      long count = backend.getNumberOfChildren(entry.getName());
      return count >= 0 && Long.parseLong(value.toString()) == count;
    }
    catch (NumberFormatException e)
    {
        logger.traceException(e);
        return false;
    }
    catch (DirectoryException e)
    catch (NumberFormatException | DirectoryException e)
    {
      logger.traceException(e);
      return false;

 opendj-sdk/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/LDAPRequestHandler.java

@@ -204,13 +204,7 @@
            }
          }
        }
        catch (DecodeException e)
        {
          logger.traceException(e);
          readyConnection.disconnect(DisconnectReason.PROTOCOL_ERROR, true,
            e.getMessageObject());
        }
        catch (LDAPException e)
        catch (DecodeException | LDAPException e)
        {
          logger.traceException(e);
          readyConnection.disconnect(DisconnectReason.PROTOCOL_ERROR, true,

 opendj-sdk/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/LDAPReplicationDomain.java

@@ -2419,13 +2419,7 @@
          replayErrorMsg = message.toString();
          updateError(csn);
        }
      } catch (DecodeException e)
      {
        replayErrorMsg = logDecodingOperationError(msg, e);
      } catch (LDAPException e)
      {
        replayErrorMsg = logDecodingOperationError(msg, e);
      } catch (DataFormatException e)
      } catch (DecodeException | LDAPException | DataFormatException e)
      {
        replayErrorMsg = logDecodingOperationError(msg, e);
      } catch (Exception e)

 opendj-sdk/opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/Session.java

@@ -433,22 +433,7 @@
            + totalLength + " bytes.");
      }
    }
    catch (final IOException e)
    {
      setSessionError(e);
      throw e;
    }
    catch (final DataFormatException e)
    {
      setSessionError(e);
      throw e;
    }
    catch (final NotSupportedOldVersionPDUException e)
    {
      setSessionError(e);
      throw e;
    }
    catch (final RuntimeException e)
    catch (final IOException | DataFormatException | NotSupportedOldVersionPDUException | RuntimeException e)
    {
      setSessionError(e);
      throw e;

 opendj-sdk/opendj-server-legacy/src/main/java/org/opends/server/tasks/AddSchemaFileTask.java

@@ -49,6 +49,7 @@
import static org.opends.messages.TaskMessages.*;
import static org.opends.server.config.ConfigConstants.*;
import static org.opends.server.core.DirectoryServer.getSchemaDN;
import static org.opends.server.core.DirectoryServer.getServerErrorResultCode;
import static org.opends.server.util.ServerConstants.*;
import static org.opends.server.util.StaticUtils.*;

@@ -152,23 +153,12 @@
      {
        SchemaConfigManager.loadSchemaFile(schema, schemaFile);
      }
      catch (ConfigException ce)
      catch (ConfigException | InitializationException e)
      {
        logger.traceException(ce);
        logger.traceException(e);

        LocalizableMessage message = ERR_TASK_ADDSCHEMAFILE_ERROR_LOADING_SCHEMA_FILE.get(
            schemaFile, ce.getMessage());
        throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
                                     message, ce);
      }
      catch (InitializationException ie)
      {
        logger.traceException(ie);

        LocalizableMessage message = ERR_TASK_ADDSCHEMAFILE_ERROR_LOADING_SCHEMA_FILE.get(
            schemaFile, ie.getMessage());
        throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
                                     message, ie);
        LocalizableMessage message = ERR_TASK_ADDSCHEMAFILE_ERROR_LOADING_SCHEMA_FILE.get(schemaFile, e.getMessage());
        throw new DirectoryException(getServerErrorResultCode(), message, e);
      }
    }
  }
@@ -227,16 +217,10 @@
                .toAttribute()));
          }
        }
        catch (ConfigException ce)
        catch (ConfigException | InitializationException e)
        {
          logger.traceException(ce);
          logger.error(ERR_TASK_ADDSCHEMAFILE_ERROR_LOADING_SCHEMA_FILE, schemaFile, ce.getMessage());
          return TaskState.STOPPED_BY_ERROR;
        }
        catch (InitializationException ie)
        {
          logger.traceException(ie);
          logger.error(ERR_TASK_ADDSCHEMAFILE_ERROR_LOADING_SCHEMA_FILE, schemaFile, ie.getMessage());
          logger.traceException(e);
          logger.error(ERR_TASK_ADDSCHEMAFILE_ERROR_LOADING_SCHEMA_FILE, schemaFile, e.getMessage());
          return TaskState.STOPPED_BY_ERROR;
        }
      }

 opendj-sdk/opendj-server-legacy/src/main/java/org/opends/server/tools/BackUpDB.java

@@ -632,15 +632,9 @@
      {
        directoryServer.initializeSchema();
      }
      catch (ConfigException ce)
      catch (ConfigException | InitializationException e)
      {
        LocalizableMessage message = ERR_CANNOT_LOAD_SCHEMA.get(ce.getMessage());
        err.println(wrapText(message, MAX_LINE_WIDTH));
        return 1;
      }
      catch (InitializationException ie)
      {
        LocalizableMessage message = ERR_CANNOT_LOAD_SCHEMA.get(ie.getMessage());
        LocalizableMessage message = ERR_CANNOT_LOAD_SCHEMA.get(e.getMessage());
        err.println(wrapText(message, MAX_LINE_WIDTH));
        return 1;
      }
@@ -658,17 +652,10 @@
        CoreConfigManager coreConfigManager = new CoreConfigManager(directoryServer.getServerContext());
        coreConfigManager.initializeCoreConfig();
      }
      catch (ConfigException ce)
      catch (ConfigException | InitializationException e)
      {
        LocalizableMessage message =
                ERR_CANNOT_INITIALIZE_CORE_CONFIG.get(ce.getMessage());
        err.println(wrapText(message, MAX_LINE_WIDTH));
        return 1;
      }
      catch (InitializationException ie)
      {
        LocalizableMessage message =
                ERR_CANNOT_INITIALIZE_CORE_CONFIG.get(ie.getMessage());
                ERR_CANNOT_INITIALIZE_CORE_CONFIG.get(e.getMessage());
        err.println(wrapText(message, MAX_LINE_WIDTH));
        return 1;
      }
@@ -686,24 +673,15 @@
      {
        directoryServer.initializeCryptoManager();
      }
      catch (ConfigException ce)
      catch (ConfigException | InitializationException e)
      {
        LocalizableMessage message = ERR_CANNOT_INITIALIZE_CRYPTO_MANAGER.get(
                ce.getMessage());
        err.println(wrapText(message, MAX_LINE_WIDTH));
        return 1;
      }
      catch (InitializationException ie)
      {
        LocalizableMessage message = ERR_CANNOT_INITIALIZE_CRYPTO_MANAGER.get(
                ie.getMessage());
        LocalizableMessage message = ERR_CANNOT_INITIALIZE_CRYPTO_MANAGER.get(e.getMessage());
        err.println(wrapText(message, MAX_LINE_WIDTH));
        return 1;
      }
      catch (Exception e)
      {
        LocalizableMessage message = ERR_CANNOT_INITIALIZE_CRYPTO_MANAGER.get(
                getExceptionMessage(e));
        LocalizableMessage message = ERR_CANNOT_INITIALIZE_CRYPTO_MANAGER.get(getExceptionMessage(e));
        err.println(wrapText(message, MAX_LINE_WIDTH));
        return 1;
      }

 opendj-sdk/opendj-server-legacy/src/main/java/org/opends/server/tools/DBTest.java

@@ -467,24 +467,15 @@
      {
        directoryServer.initializeSchema();
      }
      catch (ConfigException ce)
      catch (ConfigException | InitializationException e)
      {
        LocalizableMessage message = ERR_CANNOT_LOAD_SCHEMA.get(
            ce.getMessage());
        printMessage(message);
        return 1;
      }
      catch (InitializationException ie)
      {
        LocalizableMessage message = ERR_CANNOT_LOAD_SCHEMA.get(
            ie.getMessage());
        LocalizableMessage message = ERR_CANNOT_LOAD_SCHEMA.get(e.getMessage());
        printMessage(message);
        return 1;
      }
      catch (Exception e)
      {
        LocalizableMessage message = ERR_CANNOT_LOAD_SCHEMA.get(
            getExceptionMessage(e));
        LocalizableMessage message = ERR_CANNOT_LOAD_SCHEMA.get(getExceptionMessage(e));
        printMessage(message);
        return 1;
      }
@@ -497,24 +488,15 @@
        CoreConfigManager coreConfigManager = new CoreConfigManager(directoryServer.getServerContext());
        coreConfigManager.initializeCoreConfig();
      }
      catch (ConfigException ce)
      catch (ConfigException | InitializationException e)
      {
        LocalizableMessage message = ERR_CANNOT_INITIALIZE_CORE_CONFIG.get(
                ce.getMessage());
        printMessage(message);
        return 1;
      }
      catch (InitializationException ie)
      {
        LocalizableMessage message = ERR_CANNOT_INITIALIZE_CORE_CONFIG.get(
                ie.getMessage());
        LocalizableMessage message = ERR_CANNOT_INITIALIZE_CORE_CONFIG.get(e.getMessage());
        printMessage(message);
        return 1;
      }
      catch (Exception e)
      {
        LocalizableMessage message = ERR_CANNOT_INITIALIZE_CORE_CONFIG.get(
                getExceptionMessage(e));
        LocalizableMessage message = ERR_CANNOT_INITIALIZE_CORE_CONFIG.get(getExceptionMessage(e));
        printMessage(message);
        return 1;
      }
@@ -525,24 +507,15 @@
      {
        directoryServer.initializeCryptoManager();
      }
      catch (ConfigException ce)
      catch (ConfigException | InitializationException e)
      {
        LocalizableMessage message = ERR_CANNOT_INITIALIZE_CRYPTO_MANAGER.get(
                ce.getMessage());
        printMessage(message);
        return 1;
      }
      catch (InitializationException ie)
      {
        LocalizableMessage message = ERR_CANNOT_INITIALIZE_CRYPTO_MANAGER.get(
                ie.getMessage());
        LocalizableMessage message = ERR_CANNOT_INITIALIZE_CRYPTO_MANAGER.get(e.getMessage());
        printMessage(message);
        return 1;
      }
      catch (Exception e)
      {
        LocalizableMessage message = ERR_CANNOT_INITIALIZE_CRYPTO_MANAGER.get(
                getExceptionMessage(e));
        LocalizableMessage message = ERR_CANNOT_INITIALIZE_CRYPTO_MANAGER.get(getExceptionMessage(e));
        printMessage(message);
        return 1;
      }

 opendj-sdk/opendj-server-legacy/src/main/java/org/opends/server/tools/EncodePassword.java

@@ -409,15 +409,9 @@
      {
        directoryServer.initializeSchema();
      }
      catch (ConfigException ce)
      catch (ConfigException | InitializationException e)
      {
        LocalizableMessage message = ERR_CANNOT_LOAD_SCHEMA.get(ce.getMessage());
        err.println(wrapText(message, MAX_LINE_WIDTH));
        return OPERATIONS_ERROR;
      }
      catch (InitializationException ie)
      {
        LocalizableMessage message = ERR_CANNOT_LOAD_SCHEMA.get(ie.getMessage());
        LocalizableMessage message = ERR_CANNOT_LOAD_SCHEMA.get(e.getMessage());
        err.println(wrapText(message, MAX_LINE_WIDTH));
        return OPERATIONS_ERROR;
      }
@@ -435,17 +429,10 @@
        CoreConfigManager coreConfigManager = new CoreConfigManager(directoryServer.getServerContext());
        coreConfigManager.initializeCoreConfig();
      }
      catch (ConfigException ce)
      catch (ConfigException | InitializationException e)
      {
        LocalizableMessage message =
                ERR_CANNOT_INITIALIZE_CORE_CONFIG.get(ce.getMessage());
        err.println(wrapText(message, MAX_LINE_WIDTH));
        return OPERATIONS_ERROR;
      }
      catch (InitializationException ie)
      {
        LocalizableMessage message =
                ERR_CANNOT_INITIALIZE_CORE_CONFIG.get(ie.getMessage());
                ERR_CANNOT_INITIALIZE_CORE_CONFIG.get(e.getMessage());
        err.println(wrapText(message, MAX_LINE_WIDTH));
        return OPERATIONS_ERROR;
      }
@@ -470,25 +457,15 @@
             new PasswordStorageSchemeConfigManager(directoryServer.getServerContext());
        storageSchemeConfigManager.initializePasswordStorageSchemes();
      }
      catch (ConfigException ce)
      catch (ConfigException | InitializationException e)
      {
        LocalizableMessage message =
                ERR_ENCPW_CANNOT_INITIALIZE_STORAGE_SCHEMES.get(
                        ce.getMessage());
        err.println(wrapText(message, MAX_LINE_WIDTH));
        return OPERATIONS_ERROR;
      }
      catch (InitializationException ie)
      {
        LocalizableMessage message = ERR_ENCPW_CANNOT_INITIALIZE_STORAGE_SCHEMES.get(
                ie.getMessage());
        LocalizableMessage message = ERR_ENCPW_CANNOT_INITIALIZE_STORAGE_SCHEMES.get(e.getMessage());
        err.println(wrapText(message, MAX_LINE_WIDTH));
        return OPERATIONS_ERROR;
      }
      catch (Exception e)
      {
        LocalizableMessage message = ERR_ENCPW_CANNOT_INITIALIZE_STORAGE_SCHEMES.get(
                getExceptionMessage(e));
        LocalizableMessage message = ERR_ENCPW_CANNOT_INITIALIZE_STORAGE_SCHEMES.get(getExceptionMessage(e));
        err.println(wrapText(message, MAX_LINE_WIDTH));
        return OPERATIONS_ERROR;
      }
@@ -793,24 +770,15 @@
      {
        directoryServer.initializeCryptoManager();
      }
      catch (ConfigException ce)
      catch (ConfigException | InitializationException e)
      {
        LocalizableMessage message = ERR_CANNOT_INITIALIZE_CRYPTO_MANAGER.get(
                ce.getMessage());
        err.println(wrapText(message, MAX_LINE_WIDTH));
        return false;
      }
      catch (InitializationException ie)
      {
        LocalizableMessage message = ERR_CANNOT_INITIALIZE_CRYPTO_MANAGER.get(
                ie.getMessage());
        LocalizableMessage message = ERR_CANNOT_INITIALIZE_CRYPTO_MANAGER.get(e.getMessage());
        err.println(wrapText(message, MAX_LINE_WIDTH));
        return false;
      }
      catch (Exception e)
      {
        LocalizableMessage message = ERR_CANNOT_INITIALIZE_CRYPTO_MANAGER.get(
                getExceptionMessage(e));
        LocalizableMessage message = ERR_CANNOT_INITIALIZE_CRYPTO_MANAGER.get(getExceptionMessage(e));
        err.println(wrapText(message, MAX_LINE_WIDTH));
        return false;
      }
@@ -825,14 +793,8 @@
          directoryServer.initializeAuthenticationPolicyComponents();
          directoryServer.initializeAuthenticatedUsers();
          new CryptoManagerSync();
    } catch (InitializationException ie) {
        LocalizableMessage message = ERR_ENCPW_CANNOT_INITIALIZE_SERVER_COMPONENTS.get(
                getExceptionMessage(ie));
        err.println(wrapText(message, MAX_LINE_WIDTH));
        return false;
    } catch (ConfigException ce) {
        LocalizableMessage message = ERR_ENCPW_CANNOT_INITIALIZE_SERVER_COMPONENTS.get(
                getExceptionMessage(ce));
    } catch (InitializationException | ConfigException e) {
        LocalizableMessage message = ERR_ENCPW_CANNOT_INITIALIZE_SERVER_COMPONENTS.get(getExceptionMessage(e));
        err.println(wrapText(message, MAX_LINE_WIDTH));
        return false;
    }

 opendj-sdk/opendj-server-legacy/src/main/java/org/opends/server/tools/ExportLDIF.java

@@ -489,15 +489,9 @@
      {
        directoryServer.initializeSchema();
      }
      catch (ConfigException ce)
      catch (ConfigException | InitializationException e)
      {
        LocalizableMessage message = ERR_CANNOT_LOAD_SCHEMA.get(ce.getMessage());
        err.println(wrapText(message, MAX_LINE_WIDTH));
        return 1;
      }
      catch (InitializationException ie)
      {
        LocalizableMessage message = ERR_CANNOT_LOAD_SCHEMA.get(ie.getMessage());
        LocalizableMessage message = ERR_CANNOT_LOAD_SCHEMA.get(e.getMessage());
        err.println(wrapText(message, MAX_LINE_WIDTH));
        return 1;
      }
@@ -515,17 +509,10 @@
        CoreConfigManager coreConfigManager = new CoreConfigManager(directoryServer.getServerContext());
        coreConfigManager.initializeCoreConfig();
      }
      catch (ConfigException ce)
      catch (ConfigException | InitializationException e)
      {
        LocalizableMessage message =
                ERR_CANNOT_INITIALIZE_CORE_CONFIG.get(ce.getMessage());
        err.println(wrapText(message, MAX_LINE_WIDTH));
        return 1;
      }
      catch (InitializationException ie)
      {
        LocalizableMessage message =
                ERR_CANNOT_INITIALIZE_CORE_CONFIG.get(ie.getMessage());
                ERR_CANNOT_INITIALIZE_CORE_CONFIG.get(e.getMessage());
        err.println(wrapText(message, MAX_LINE_WIDTH));
        return 1;
      }
@@ -543,25 +530,17 @@
      {
        directoryServer.initializeCryptoManager();
      }
      catch (ConfigException ce)
      catch (ConfigException | InitializationException e)
      {
        LocalizableMessage message =
                ERR_CANNOT_INITIALIZE_CRYPTO_MANAGER.get(ce.getMessage());
        err.println(wrapText(message, MAX_LINE_WIDTH));
        return 1;
      }
      catch (InitializationException ie)
      {
        LocalizableMessage message =
                ERR_CANNOT_INITIALIZE_CRYPTO_MANAGER.get(ie.getMessage());
                ERR_CANNOT_INITIALIZE_CRYPTO_MANAGER.get(e.getMessage());
        err.println(wrapText(message, MAX_LINE_WIDTH));
        return 1;
      }
      catch (Exception e)
      {
        LocalizableMessage message =
                ERR_CANNOT_INITIALIZE_CRYPTO_MANAGER.get(
                        getExceptionMessage(e));
                ERR_CANNOT_INITIALIZE_CRYPTO_MANAGER.get(getExceptionMessage(e));
        err.println(wrapText(message, MAX_LINE_WIDTH));
        return 1;
      }
@@ -591,25 +570,17 @@
        pluginTypes.add(PluginType.LDIF_EXPORT);
        directoryServer.initializePlugins(pluginTypes);
      }
      catch (ConfigException ce)
      catch (ConfigException | InitializationException e)
      {
        LocalizableMessage message =
                ERR_LDIFEXPORT_CANNOT_INITIALIZE_PLUGINS.get(ce.getMessage());
        err.println(wrapText(message, MAX_LINE_WIDTH));
        return 1;
      }
      catch (InitializationException ie)
      {
        LocalizableMessage message =
                ERR_LDIFEXPORT_CANNOT_INITIALIZE_PLUGINS.get(ie.getMessage());
                ERR_LDIFEXPORT_CANNOT_INITIALIZE_PLUGINS.get(e.getMessage());
        err.println(wrapText(message, MAX_LINE_WIDTH));
        return 1;
      }
      catch (Exception e)
      {
        LocalizableMessage message =
                ERR_LDIFEXPORT_CANNOT_INITIALIZE_PLUGINS.get(
                        getExceptionMessage(e));
                ERR_LDIFEXPORT_CANNOT_INITIALIZE_PLUGINS.get(getExceptionMessage(e));
        err.println(wrapText(message, MAX_LINE_WIDTH));
        return 1;
      }

 opendj-sdk/opendj-server-legacy/src/main/java/org/opends/server/tools/ImportLDIF.java

@@ -1252,11 +1252,7 @@
    {
      throw e;
    }
    catch (ConfigException e2)
    {
      return e2.getMessage();
    }
    catch (InitializationException e2)
    catch (ConfigException | InitializationException e2)
    {
      return e2.getMessage();
    }

 opendj-sdk/opendj-server-legacy/src/main/java/org/opends/server/tools/LDAPAuthenticationHandler.java

@@ -321,8 +321,7 @@
    {
      LocalizableMessage message =
          ERR_LDAPAUTH_CANNOT_SEND_SIMPLE_BIND.get(getExceptionMessage(e));
      throw new ClientException(ReturnCode.CLIENT_SIDE_ENCODING_ERROR,
                                message, e);
      throw new ClientException(ReturnCode.CLIENT_SIDE_ENCODING_ERROR, message, e);
    }


@@ -339,12 +338,11 @@
                                  message);
      }
    }
    catch (DecodeException ae)
    catch (DecodeException | LDAPException e)
    {
      LocalizableMessage message =
          ERR_LDAPAUTH_CANNOT_READ_BIND_RESPONSE.get(getExceptionMessage(ae));
      throw new ClientException(ReturnCode.CLIENT_SIDE_DECODING_ERROR,
          message, ae);
          ERR_LDAPAUTH_CANNOT_READ_BIND_RESPONSE.get(getExceptionMessage(e));
      throw new ClientException(ReturnCode.CLIENT_SIDE_DECODING_ERROR, message, e);
    }
    catch (IOException ioe)
    {
@@ -353,13 +351,6 @@
      throw new ClientException(
          ReturnCode.CLIENT_SIDE_SERVER_DOWN, message, ioe);
    }
    catch (LDAPException le)
    {
      LocalizableMessage message =
          ERR_LDAPAUTH_CANNOT_READ_BIND_RESPONSE.get(getExceptionMessage(le));
      throw new ClientException(ReturnCode.CLIENT_SIDE_DECODING_ERROR,
                                message, le);
    }
    catch (Exception e)
    {
      LocalizableMessage message =
@@ -632,8 +623,7 @@
    {
      LocalizableMessage message = ERR_LDAPAUTH_CANNOT_SEND_SASL_BIND.get(
          SASL_MECHANISM_ANONYMOUS, getExceptionMessage(e));
      throw new ClientException(ReturnCode.CLIENT_SIDE_ENCODING_ERROR,
                                message, e);
      throw new ClientException(ReturnCode.CLIENT_SIDE_ENCODING_ERROR, message, e);
    }


@@ -650,12 +640,11 @@
                                  message);
      }
    }
    catch (DecodeException ae)
    catch (DecodeException | LDAPException e)
    {
      LocalizableMessage message =
          ERR_LDAPAUTH_CANNOT_READ_BIND_RESPONSE.get(getExceptionMessage(ae));
      throw new ClientException(ReturnCode.CLIENT_SIDE_DECODING_ERROR,
          message, ae);
          ERR_LDAPAUTH_CANNOT_READ_BIND_RESPONSE.get(getExceptionMessage(e));
      throw new ClientException(ReturnCode.CLIENT_SIDE_DECODING_ERROR, message, e);
    }
    catch (IOException ioe)
    {
@@ -664,13 +653,6 @@
      throw new ClientException(
              ReturnCode.CLIENT_SIDE_SERVER_DOWN, message, ioe);
    }
    catch (LDAPException le)
    {
      LocalizableMessage message =
          ERR_LDAPAUTH_CANNOT_READ_BIND_RESPONSE.get(getExceptionMessage(le));
      throw new ClientException(ReturnCode.CLIENT_SIDE_DECODING_ERROR,
                                message, le);
    }
    catch (Exception e)
    {
      LocalizableMessage message =
@@ -884,8 +866,7 @@
    {
      LocalizableMessage message = ERR_LDAPAUTH_CANNOT_SEND_INITIAL_SASL_BIND.get(
          SASL_MECHANISM_CRAM_MD5, getExceptionMessage(e));
      throw new ClientException(ReturnCode.CLIENT_SIDE_ENCODING_ERROR,
                                message, e);
      throw new ClientException(ReturnCode.CLIENT_SIDE_ENCODING_ERROR, message, e);
    }


@@ -902,13 +883,12 @@
                                  message);
      }
    }
    catch (DecodeException ae)
    catch (DecodeException | LDAPException e)
    {
      LocalizableMessage message =
          ERR_LDAPAUTH_CANNOT_READ_INITIAL_BIND_RESPONSE.get(
              SASL_MECHANISM_CRAM_MD5, getExceptionMessage(ae));
      throw new ClientException(ReturnCode.CLIENT_SIDE_DECODING_ERROR,
          message, ae);
              SASL_MECHANISM_CRAM_MD5, getExceptionMessage(e));
      throw new ClientException(ReturnCode.CLIENT_SIDE_DECODING_ERROR, message, e);
    }
    catch (IOException ioe)
    {
@@ -917,13 +897,6 @@
      throw new ClientException(
              ReturnCode.CLIENT_SIDE_SERVER_DOWN, message, ioe);
    }
    catch (LDAPException le)
    {
      LocalizableMessage message = ERR_LDAPAUTH_CANNOT_READ_INITIAL_BIND_RESPONSE.get(
          SASL_MECHANISM_CRAM_MD5, getExceptionMessage(le));
      throw new ClientException(ReturnCode.CLIENT_SIDE_DECODING_ERROR,
                                message, le);
    }
    catch (Exception e)
    {
      LocalizableMessage message = ERR_LDAPAUTH_CANNOT_READ_INITIAL_BIND_RESPONSE.get(
@@ -1046,13 +1019,12 @@
                                  message);
      }
    }
    catch (DecodeException ae)
    catch (DecodeException | LDAPException e)
    {
      LocalizableMessage message =
          ERR_LDAPAUTH_CANNOT_READ_SECOND_BIND_RESPONSE.get(
              SASL_MECHANISM_CRAM_MD5, getExceptionMessage(ae));
      throw new ClientException(ReturnCode.CLIENT_SIDE_DECODING_ERROR,
          message, ae);
              SASL_MECHANISM_CRAM_MD5, getExceptionMessage(e));
      throw new ClientException(ReturnCode.CLIENT_SIDE_DECODING_ERROR, message, e);
    }
    catch (IOException ioe)
    {
@@ -1061,13 +1033,6 @@
      throw new ClientException(
              ReturnCode.CLIENT_SIDE_SERVER_DOWN, message, ioe);
    }
    catch (LDAPException le)
    {
      LocalizableMessage message = ERR_LDAPAUTH_CANNOT_READ_SECOND_BIND_RESPONSE.get(
          SASL_MECHANISM_CRAM_MD5, getExceptionMessage(le));
      throw new ClientException(ReturnCode.CLIENT_SIDE_DECODING_ERROR,
                                message, le);
    }
    catch (Exception e)
    {
      LocalizableMessage message = ERR_LDAPAUTH_CANNOT_READ_SECOND_BIND_RESPONSE.get(
@@ -1483,13 +1448,12 @@
                                  message);
      }
    }
    catch (DecodeException ae)
    catch (DecodeException | LDAPException e)
    {
      LocalizableMessage message =
          ERR_LDAPAUTH_CANNOT_READ_INITIAL_BIND_RESPONSE.get(
              SASL_MECHANISM_DIGEST_MD5, getExceptionMessage(ae));
      throw new ClientException(ReturnCode.CLIENT_SIDE_DECODING_ERROR,
          message, ae);
              SASL_MECHANISM_DIGEST_MD5, getExceptionMessage(e));
      throw new ClientException(ReturnCode.CLIENT_SIDE_DECODING_ERROR, message, e);
    }
    catch (IOException ioe)
    {
@@ -1498,13 +1462,6 @@
      throw new ClientException(
              ReturnCode.CLIENT_SIDE_SERVER_DOWN, message, ioe);
    }
    catch (LDAPException le)
    {
      LocalizableMessage message = ERR_LDAPAUTH_CANNOT_READ_INITIAL_BIND_RESPONSE.get(
          SASL_MECHANISM_DIGEST_MD5, getExceptionMessage(le));
      throw new ClientException(ReturnCode.CLIENT_SIDE_DECODING_ERROR,
                                message, le);
    }
    catch (Exception e)
    {
      LocalizableMessage message = ERR_LDAPAUTH_CANNOT_READ_INITIAL_BIND_RESPONSE.get(
@@ -1796,13 +1753,12 @@
                                  message);
      }
    }
    catch (DecodeException ae)
    catch (DecodeException | LDAPException e)
    {
      LocalizableMessage message =
          ERR_LDAPAUTH_CANNOT_READ_SECOND_BIND_RESPONSE.get(
              SASL_MECHANISM_DIGEST_MD5, getExceptionMessage(ae));
      throw new ClientException(ReturnCode.CLIENT_SIDE_DECODING_ERROR,
          message, ae);
              SASL_MECHANISM_DIGEST_MD5, getExceptionMessage(e));
      throw new ClientException(ReturnCode.CLIENT_SIDE_DECODING_ERROR, message, e);
    }
    catch (IOException ioe)
    {
@@ -1811,13 +1767,6 @@
      throw new ClientException(
              ReturnCode.CLIENT_SIDE_SERVER_DOWN, message, ioe);
    }
    catch (LDAPException le)
    {
      LocalizableMessage message = ERR_LDAPAUTH_CANNOT_READ_SECOND_BIND_RESPONSE.get(
          SASL_MECHANISM_DIGEST_MD5, getExceptionMessage(le));
      throw new ClientException(ReturnCode.CLIENT_SIDE_DECODING_ERROR,
                                message, le);
    }
    catch (Exception e)
    {
      LocalizableMessage message = ERR_LDAPAUTH_CANNOT_READ_SECOND_BIND_RESPONSE.get(
@@ -2461,7 +2410,7 @@
                                  message);
      }
    }
    catch (DecodeException e)
    catch (DecodeException | LDAPException e)
    {
      LocalizableMessage message =
          ERR_LDAPAUTH_CANNOT_READ_BIND_RESPONSE.get(getExceptionMessage(e));
@@ -2475,13 +2424,6 @@
      throw new ClientException(
              ReturnCode.CLIENT_SIDE_SERVER_DOWN, message, ioe);
    }
    catch (LDAPException le)
    {
      LocalizableMessage message =
          ERR_LDAPAUTH_CANNOT_READ_BIND_RESPONSE.get(getExceptionMessage(le));
      throw new ClientException(ReturnCode.CLIENT_SIDE_DECODING_ERROR,
                                message, le);
    }
    catch (Exception e)
    {
      LocalizableMessage message =
@@ -3055,12 +2997,11 @@
                                  message);
      }
    }
    catch (DecodeException ae)
    catch (DecodeException | LDAPException e)
    {
      LocalizableMessage message =
          ERR_LDAPAUTH_CANNOT_READ_BIND_RESPONSE.get(getExceptionMessage(ae));
      throw new ClientException(ReturnCode.CLIENT_SIDE_DECODING_ERROR,
          message, ae);
          ERR_LDAPAUTH_CANNOT_READ_BIND_RESPONSE.get(getExceptionMessage(e));
      throw new ClientException(ReturnCode.CLIENT_SIDE_DECODING_ERROR, message, e);
    }
    catch (IOException ioe)
    {
@@ -3069,13 +3010,6 @@
      throw new ClientException(
              ReturnCode.CLIENT_SIDE_SERVER_DOWN, message, ioe);
    }
    catch (LDAPException le)
    {
      LocalizableMessage message =
          ERR_LDAPAUTH_CANNOT_READ_BIND_RESPONSE.get(getExceptionMessage(le));
      throw new ClientException(ReturnCode.CLIENT_SIDE_DECODING_ERROR,
                                message, le);
    }
    catch (Exception e)
    {
      LocalizableMessage message =
@@ -3284,12 +3218,11 @@
                                    message);
        }
      }
      catch (DecodeException ae)
      catch (DecodeException | LDAPException e)
      {
        LocalizableMessage message =
            ERR_LDAPAUTH_CANNOT_READ_BIND_RESPONSE.get(getExceptionMessage(ae));
        throw new ClientException(ReturnCode.CLIENT_SIDE_DECODING_ERROR,
            message, ae);
            ERR_LDAPAUTH_CANNOT_READ_BIND_RESPONSE.get(getExceptionMessage(e));
        throw new ClientException(ReturnCode.CLIENT_SIDE_DECODING_ERROR, message, e);
      }
      catch (IOException ioe)
      {
@@ -3298,13 +3231,6 @@
        throw new ClientException(
                ReturnCode.CLIENT_SIDE_SERVER_DOWN, message, ioe);
      }
      catch (LDAPException le)
      {
        LocalizableMessage message =
            ERR_LDAPAUTH_CANNOT_READ_BIND_RESPONSE.get(getExceptionMessage(le));
        throw new ClientException(ReturnCode.CLIENT_SIDE_DECODING_ERROR,
                                  message, le);
      }
      catch (Exception e)
      {
        LocalizableMessage message =
@@ -3457,13 +3383,12 @@
                                        message);
            }
          }
          catch (DecodeException ae)
          catch (DecodeException | LDAPException e)
          {
            LocalizableMessage message =
                ERR_LDAPAUTH_CANNOT_READ_BIND_RESPONSE
                    .get(getExceptionMessage(ae));
                ERR_LDAPAUTH_CANNOT_READ_BIND_RESPONSE.get(getExceptionMessage(e));
            throw new ClientException(
                ReturnCode.CLIENT_SIDE_DECODING_ERROR, message, ae);
                ReturnCode.CLIENT_SIDE_DECODING_ERROR, message, e);
          }
          catch (IOException ioe)
          {
@@ -3472,13 +3397,6 @@
            throw new ClientException(ReturnCode.CLIENT_SIDE_SERVER_DOWN,
                                      message, ioe);
          }
          catch (LDAPException le)
          {
            LocalizableMessage message = ERR_LDAPAUTH_CANNOT_READ_BIND_RESPONSE.get(
                getExceptionMessage(le));
            throw new ClientException(ReturnCode.CLIENT_SIDE_DECODING_ERROR,
                                      message, le);
          }
          catch (Exception e)
          {
            LocalizableMessage message = ERR_LDAPAUTH_CANNOT_READ_BIND_RESPONSE.get(
@@ -3669,12 +3587,11 @@
                                  message);
      }
    }
    catch (DecodeException ae)
    catch (DecodeException | LDAPException e)
    {
      LocalizableMessage message =
          ERR_LDAPAUTH_CANNOT_READ_WHOAMI_RESPONSE.get(getExceptionMessage(ae));
      throw new ClientException(ReturnCode.CLIENT_SIDE_DECODING_ERROR,
          message, ae);
          ERR_LDAPAUTH_CANNOT_READ_WHOAMI_RESPONSE.get(getExceptionMessage(e));
      throw new ClientException(ReturnCode.CLIENT_SIDE_DECODING_ERROR, message, e);
    }
    catch (IOException ioe)
    {
@@ -3683,13 +3600,6 @@
      throw new ClientException(
              ReturnCode.CLIENT_SIDE_SERVER_DOWN, message, ioe);
    }
    catch (LDAPException le)
    {
      LocalizableMessage message =
          ERR_LDAPAUTH_CANNOT_READ_WHOAMI_RESPONSE.get(getExceptionMessage(le));
      throw new ClientException(ReturnCode.CLIENT_SIDE_DECODING_ERROR,
                                message, le);
    }
    catch (Exception e)
    {
      LocalizableMessage message =

 opendj-sdk/opendj-server-legacy/src/main/java/org/opends/server/tools/LDAPConnection.java

@@ -249,16 +249,10 @@
      socket = createSSLOrBasicSocket(startTLSSocket, sslConnectionFactory);
      ldapWriter = new LDAPWriter(socket);
      ldapReader = new LDAPReader(socket);
    } catch(UnknownHostException uhe)
    } catch(UnknownHostException | ConnectException e)
    {
      LocalizableMessage msg = INFO_RESULT_CLIENT_SIDE_CONNECT_ERROR.get();
      throw new LDAPConnectionException(msg, CLIENT_SIDE_CONNECT_ERROR, null,
                                        uhe);
    } catch(ConnectException ce)
    {
      LocalizableMessage msg = INFO_RESULT_CLIENT_SIDE_CONNECT_ERROR.get();
      throw new LDAPConnectionException(msg, CLIENT_SIDE_CONNECT_ERROR, null,
                                        ce);
      throw new LDAPConnectionException(msg, CLIENT_SIDE_CONNECT_ERROR, null, e);
    } catch (LDAPConnectionException e)
    {
      throw e;

 opendj-sdk/opendj-server-legacy/src/main/java/org/opends/server/tools/ListBackends.java

@@ -282,15 +282,9 @@
      {
        directoryServer.initializeSchema();
      }
      catch (ConfigException ce)
      catch (ConfigException | InitializationException e)
      {
        LocalizableMessage message = ERR_CANNOT_LOAD_SCHEMA.get(ce.getMessage());
        err.println(wrapText(message, MAX_LINE_WIDTH));
        return 1;
      }
      catch (InitializationException ie)
      {
        LocalizableMessage message = ERR_CANNOT_LOAD_SCHEMA.get(ie.getMessage());
        LocalizableMessage message = ERR_CANNOT_LOAD_SCHEMA.get(e.getMessage());
        err.println(wrapText(message, MAX_LINE_WIDTH));
        return 1;
      }
@@ -303,7 +297,7 @@
    }


    // Retrieve a list of the backkends defined in the server.
    // Retrieve a list of the backends defined in the server.
    TreeMap<String,TreeSet<DN>> backends;
    try
    {

 opendj-sdk/opendj-server-legacy/src/main/java/org/opends/server/tools/RestoreDB.java

@@ -369,15 +369,9 @@
      {
        directoryServer.initializeSchema();
      }
      catch (ConfigException ce)
      catch (ConfigException | InitializationException e)
      {
        LocalizableMessage message = ERR_CANNOT_LOAD_SCHEMA.get(ce.getMessage());
        err.println(wrapText(message, MAX_LINE_WIDTH));
        return 1;
      }
      catch (InitializationException ie)
      {
        LocalizableMessage message = ERR_CANNOT_LOAD_SCHEMA.get(ie.getMessage());
        LocalizableMessage message = ERR_CANNOT_LOAD_SCHEMA.get(e.getMessage());
        err.println(wrapText(message, MAX_LINE_WIDTH));
        return 1;
      }
@@ -395,24 +389,15 @@
        CoreConfigManager coreConfigManager = new CoreConfigManager(directoryServer.getServerContext());
        coreConfigManager.initializeCoreConfig();
      }
      catch (ConfigException ce)
      catch (ConfigException | InitializationException e)
      {
        LocalizableMessage message = ERR_CANNOT_INITIALIZE_CORE_CONFIG.get(
                ce.getMessage());
        err.println(wrapText(message, MAX_LINE_WIDTH));
        return 1;
      }
      catch (InitializationException ie)
      {
        LocalizableMessage message = ERR_CANNOT_INITIALIZE_CORE_CONFIG.get(
                ie.getMessage());
        LocalizableMessage message = ERR_CANNOT_INITIALIZE_CORE_CONFIG.get(e.getMessage());
        err.println(wrapText(message, MAX_LINE_WIDTH));
        return 1;
      }
      catch (Exception e)
      {
        LocalizableMessage message = ERR_CANNOT_INITIALIZE_CORE_CONFIG.get(
                getExceptionMessage(e));
        LocalizableMessage message = ERR_CANNOT_INITIALIZE_CORE_CONFIG.get(getExceptionMessage(e));
        err.println(wrapText(message, MAX_LINE_WIDTH));
        return 1;
      }
@@ -423,24 +408,15 @@
      {
        directoryServer.initializeCryptoManager();
      }
      catch (ConfigException ce)
      catch (ConfigException | InitializationException e)
      {
        LocalizableMessage message = ERR_CANNOT_INITIALIZE_CRYPTO_MANAGER.get(
                ce.getMessage());
        err.println(wrapText(message, MAX_LINE_WIDTH));
        return 1;
      }
      catch (InitializationException ie)
      {
        LocalizableMessage message = ERR_CANNOT_INITIALIZE_CRYPTO_MANAGER.get(
                ie.getMessage());
        LocalizableMessage message = ERR_CANNOT_INITIALIZE_CRYPTO_MANAGER.get(e.getMessage());
        err.println(wrapText(message, MAX_LINE_WIDTH));
        return 1;
      }
      catch (Exception e)
      {
        LocalizableMessage message = ERR_CANNOT_INITIALIZE_CRYPTO_MANAGER.get(
                getExceptionMessage(e));
        LocalizableMessage message = ERR_CANNOT_INITIALIZE_CRYPTO_MANAGER.get(getExceptionMessage(e));
        err.println(wrapText(message, MAX_LINE_WIDTH));
        return 1;
      }

 opendj-sdk/opendj-server-legacy/src/main/java/org/opends/server/tools/StopDS.java

@@ -690,9 +690,9 @@
        return LDAPResultCode.CLIENT_SIDE_SERVER_DOWN;
      }
    }
    catch (DecodeException ae)
    catch (DecodeException | LDAPException e)
    {
      LocalizableMessage message = ERR_STOPDS_DECODE_ERROR.get(ae.getMessage());
      LocalizableMessage message = ERR_STOPDS_DECODE_ERROR.get(e.getMessage());
      err.println(wrapText(message, MAX_LINE_WIDTH));
      return LDAPResultCode.CLIENT_SIDE_DECODING_ERROR;
    }
@@ -701,12 +701,6 @@
      err.println(wrapText(ERR_STOPDS_IO_ERROR.get(ioe), MAX_LINE_WIDTH));
      return LDAPResultCode.CLIENT_SIDE_SERVER_DOWN;
    }
    catch (LDAPException le)
    {
      LocalizableMessage message = ERR_STOPDS_DECODE_ERROR.get(le.getMessage());
      err.println(wrapText(message, MAX_LINE_WIDTH));
      return LDAPResultCode.CLIENT_SIDE_DECODING_ERROR;
    }


    if (responseMessage.getProtocolOpType() !=

 opendj-sdk/opendj-server-legacy/src/main/java/org/opends/server/tools/VerifyIndex.java

@@ -281,15 +281,9 @@
      {
        directoryServer.initializeSchema();
      }
      catch (ConfigException ce)
      catch (ConfigException | InitializationException e)
      {
        LocalizableMessage message = ERR_CANNOT_LOAD_SCHEMA.get(ce.getMessage());
        err.println(wrapText(message, MAX_LINE_WIDTH));
        return 1;
      }
      catch (InitializationException ie)
      {
        LocalizableMessage message = ERR_CANNOT_LOAD_SCHEMA.get(ie.getMessage());
        LocalizableMessage message = ERR_CANNOT_LOAD_SCHEMA.get(e.getMessage());
        err.println(wrapText(message, MAX_LINE_WIDTH));
        return 1;
      }
@@ -307,17 +301,10 @@
        CoreConfigManager coreConfigManager = new CoreConfigManager(directoryServer.getServerContext());
        coreConfigManager.initializeCoreConfig();
      }
      catch (ConfigException ce)
      catch (ConfigException | InitializationException e)
      {
        LocalizableMessage message =
                ERR_CANNOT_INITIALIZE_CORE_CONFIG.get(ce.getMessage());
        err.println(wrapText(message, MAX_LINE_WIDTH));
        return 1;
      }
      catch (InitializationException ie)
      {
        LocalizableMessage message =
                ERR_CANNOT_INITIALIZE_CORE_CONFIG.get(ie.getMessage());
                ERR_CANNOT_INITIALIZE_CORE_CONFIG.get(e.getMessage());
        err.println(wrapText(message, MAX_LINE_WIDTH));
        return 1;
      }
@@ -335,17 +322,10 @@
      {
        directoryServer.initializeCryptoManager();
      }
      catch (ConfigException ce)
      catch (ConfigException | InitializationException e)
      {
        LocalizableMessage message =
                ERR_CANNOT_INITIALIZE_CRYPTO_MANAGER.get(ce.getMessage());
        err.println(wrapText(message, MAX_LINE_WIDTH));
        return 1;
      }
      catch (InitializationException ie)
      {
        LocalizableMessage message =
                ERR_CANNOT_INITIALIZE_CRYPTO_MANAGER.get(ie.getMessage());
                ERR_CANNOT_INITIALIZE_CRYPTO_MANAGER.get(e.getMessage());
        err.println(wrapText(message, MAX_LINE_WIDTH));
        return 1;
      }

 opendj-sdk/opendj-server-legacy/src/main/java/org/opends/server/tools/dsreplication/ReplicationCliArgumentParser.java

@@ -1691,13 +1691,9 @@
        taskArgs.validateArgs();
      }
    }
    catch (ClientException ce)
    catch (ClientException | ArgumentException e)
    {
      addMessage(buf, ce.getMessageObject());
    }
    catch (ArgumentException ae)
    {
      addMessage(buf, ae.getMessageObject());
      addMessage(buf, e.getMessageObject());
    }
  }


 opendj-sdk/opendj-server-legacy/src/main/java/org/opends/server/tools/dsreplication/ReplicationCliMain.java

@@ -1441,14 +1441,6 @@
        logger.info(LocalizableMessage.raw("created task entry: "+attrs));
        dirCtx.close();
      }
      catch (NameAlreadyBoundException ex)
      {
        logger.error(LocalizableMessage.raw("Error creating task "+attrs, ex));
        LocalizableMessage msg = ERR_LAUNCHING_PURGE_HISTORICAL.get();
        ReplicationCliReturnCode code = ERROR_LAUNCHING_PURGE_HISTORICAL;
        throw new ReplicationCliException(
            getThrowableMsg(msg, ex), code, ex);
      }
      catch (NamingException ne)
      {
        logger.error(LocalizableMessage.raw("Error creating task "+attrs, ne));

 opendj-sdk/opendj-server-legacy/src/main/java/org/opends/server/tools/status/StatusCli.java

@@ -22,7 +22,7 @@
 *
 *
 *      Copyright 2007-2010 Sun Microsystems, Inc.
 *      Portions Copyright 2011-2014 ForgeRock AS
 *      Portions Copyright 2011-2015 ForgeRock AS
 */
package org.opends.server.tools.status;

@@ -324,10 +324,7 @@
          controlInfo.setTrustManager(interactiveTrustManager);
          useInteractiveTrustManager = true;
        }
      } catch (ArgumentException e) {
        println(e.getMessageObject());
        return ReturnCode.CLIENT_SIDE_PARAM_ERROR.get();
      } catch (ClientException e) {
      } catch (ArgumentException | ClientException e) {
        println(e.getMessageObject());
        return ReturnCode.CLIENT_SIDE_PARAM_ERROR.get();
      } finally {
@@ -1241,4 +1238,4 @@

    return LDAPManagementContext.newManagementContext(connection, LDAPProfile.getInstance());
  }
}
}

 opendj-sdk/opendj-server-legacy/src/main/java/org/opends/server/tools/tasks/TaskTool.java

@@ -339,10 +339,6 @@
          }
        }
        ret = 0;
      } catch (ArgumentException e) {
        LocalizableMessage message = e.getMessageObject();
        if (err != null) err.println(wrapText(message, MAX_LINE_WIDTH));
        ret = 1;
      } catch (LDAPConnectionException e) {
        LocalizableMessage message;
        if (isWrongPortException(e,
@@ -368,7 +364,7 @@
        LocalizableMessage message = ERR_TASK_TOOL_LDAP_ERROR.get(le.getMessage());
        if (err != null) err.println(wrapText(message, MAX_LINE_WIDTH));
        ret = 1;
      } catch (OpenDsException e) {
      } catch (ArgumentException | OpenDsException e) {
        LocalizableMessage message = e.getMessageObject();
        if (err != null) err.println(wrapText(message, MAX_LINE_WIDTH));
        ret = 1;

 opendj-sdk/opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/UpgradeTasks.java

@@ -21,7 +21,7 @@
 * CDDL HEADER END
 *
 *
 *      Portions Copyright 2013-2014 ForgeRock AS
 *      Portions Copyright 2013-2015 ForgeRock AS
 */
package org.opends.server.tools.upgrade;

@@ -311,12 +311,7 @@

          context.notifyProgress(pnc.setProgress(100));
        }
        catch (final IOException e)
        {
          manageTaskException(context, ERR_UPGRADE_ADDATTRIBUTE_FAILS.get(
              schemaFileTemplate.getName(), e.getMessage()), pnc);
        }
        catch (final IllegalStateException e)
        catch (final IOException | IllegalStateException e)
        {
          manageTaskException(context, ERR_UPGRADE_ADDATTRIBUTE_FAILS.get(
              schemaFileTemplate.getName(), e.getMessage()), pnc);

 opendj-sdk/opendj-server-legacy/src/main/java/org/opends/server/types/SubtreeSpecification.java

@@ -1052,10 +1052,6 @@
        isValid = false;
      }
    }
    catch (final InputMismatchException e)
    {
      isValid = false;
    }
    catch (final NoSuchElementException e)
    {
      isValid = false;

 opendj-sdk/opendj-server-legacy/src/main/java/org/opends/server/util/args/LDAPConnectionArgumentParser.java

@@ -329,14 +329,7 @@
              ui.populateLDAPOptions(options),
              ui.getConnectTimeout(),
              out, err);
    } catch (ArgumentException e) {
      if ((e.getCause() != null) && (e.getCause().getCause() != null) &&
          e.getCause().getCause() instanceof SSLException) {
          err.println(ERR_TASKINFO_LDAP_EXCEPTION_SSL.get(ui.getHostName(), ui.getPortNumber()));
        } else {
          err.println(e.getMessageObject());
        }
      } catch (OpenDsException e) {
    } catch (ArgumentException | OpenDsException e) {
      if ((e.getCause() != null) && (e.getCause().getCause() != null) &&
        e.getCause().getCause() instanceof SSLException) {
        err.println(ERR_TASKINFO_LDAP_EXCEPTION_SSL.get(ui.getHostName(), ui.getPortNumber()));