From af7d66f0224061c7758d53ca7b8059881f56c1d0 Mon Sep 17 00:00:00 2001
From: ludovicp <ludovicp@localhost>
Date: Fri, 25 Jun 2010 10:13:48 +0000
Subject: [PATCH] Enhanced the messages logged when an IOException is encountered while writing files in the export and import/rebuild tools. Also tools now return non 0 when they encounter an IO Exception
---
opends/src/server/org/opends/server/backends/jeb/BackendImpl.java | 42 ++----------------------------------------
1 files changed, 2 insertions(+), 40 deletions(-)
diff --git a/opends/src/server/org/opends/server/backends/jeb/BackendImpl.java b/opends/src/server/org/opends/server/backends/jeb/BackendImpl.java
index 6ef7ed0..fbaeb2b 100644
--- a/opends/src/server/org/opends/server/backends/jeb/BackendImpl.java
+++ b/opends/src/server/org/opends/server/backends/jeb/BackendImpl.java
@@ -1013,7 +1013,7 @@
{
TRACER.debugCaught(DebugLogLevel.ERROR, ioe);
}
- Message message = ERR_JEB_IO_ERROR.get(ioe.getMessage());
+ Message message = ERR_JEB_EXPORT_IO_ERROR.get(ioe.getMessage());
throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
message);
}
@@ -1138,7 +1138,7 @@
rootContainer = initializeRootContainer(envConfig);
return importer.processImport(rootContainer);
}
- catch (ExecutionException execEx)
+ catch (ExecutionException execEx)
{
if (debugEnabled())
{
@@ -1158,16 +1158,6 @@
throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
message);
}
- catch (IOException ioe)
- {
- if (debugEnabled())
- {
- TRACER.debugCaught(DebugLogLevel.ERROR, ioe);
- }
- Message message = ERR_JEB_IO_ERROR.get(ioe.getMessage());
- throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
- message);
- }
catch (JebException je)
{
if (debugEnabled())
@@ -1177,16 +1167,6 @@
throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
je.getMessageObject());
}
- catch (DatabaseException ex)
- {
- if (debugEnabled())
- {
- TRACER.debugCaught(DebugLogLevel.ERROR, ex);
- }
- Message message = ERR_DATABASE_ERROR.get(ex.getMessage());
- throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
- message);
- }
catch (InitializationException ie)
{
if (debugEnabled())
@@ -1392,16 +1372,6 @@
throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
message);
}
- catch (IOException ioe)
- {
- if (debugEnabled())
- {
- TRACER.debugCaught(DebugLogLevel.ERROR, ioe);
- }
- Message message = ERR_JEB_IO_ERROR.get(ioe.getMessage());
- throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
- message);
- }
catch (ConfigException ce)
{
if (debugEnabled())
@@ -1411,14 +1381,6 @@
throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
ce.getMessageObject());
}
- catch (DatabaseException e)
- {
- if (debugEnabled())
- {
- TRACER.debugCaught(DebugLogLevel.ERROR, e);
- }
- throw createDirectoryException(e);
- }
catch (JebException e)
{
if (debugEnabled())
--
Gitblit v1.10.0