From 58e42cdaa28e32c1225deda4cfeab261d7156496 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Mon, 18 May 2015 21:52:13 +0000
Subject: [PATCH] AutoRefactor'ed Use multi-catch
---
opendj-server-legacy/src/main/java/org/opends/server/tools/EncodePassword.java | 62 ++++++-------------------------
1 files changed, 12 insertions(+), 50 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/EncodePassword.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/EncodePassword.java
index 2f744be..828b66e 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tools/EncodePassword.java
+++ b/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;
}
--
Gitblit v1.10.0