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/RestoreDB.java | 40 ++++++++--------------------------------
1 files changed, 8 insertions(+), 32 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/RestoreDB.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/RestoreDB.java
index b56ac02..e6481d7 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tools/RestoreDB.java
+++ b/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;
}
--
Gitblit v1.10.0