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/DBTest.java | 45 +++++++++------------------------------------
1 files changed, 9 insertions(+), 36 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/DBTest.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/DBTest.java
index ff75312..a968f73 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tools/DBTest.java
+++ b/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;
}
--
Gitblit v1.10.0