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