From a06fd90c9b6bfb5f9130146373ba18e5769593b6 Mon Sep 17 00:00:00 2001
From: Nicolas Capponi <nicolas.capponi@forgerock.com>
Date: Wed, 29 Jan 2014 11:30:37 +0000
Subject: [PATCH] Checkpoint commit for OPENDJ-1288 : Migrate I18n and logging support to i18n framework and SLF4J
---
opendj3-server-dev/src/server/org/opends/server/plugins/ReferentialIntegrityPlugin.java | 21 ++++++++-------------
1 files changed, 8 insertions(+), 13 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/plugins/ReferentialIntegrityPlugin.java b/opendj3-server-dev/src/server/org/opends/server/plugins/ReferentialIntegrityPlugin.java
index e4ef8c4..d030588 100644
--- a/opendj3-server-dev/src/server/org/opends/server/plugins/ReferentialIntegrityPlugin.java
+++ b/opendj3-server-dev/src/server/org/opends/server/plugins/ReferentialIntegrityPlugin.java
@@ -72,7 +72,6 @@
import org.opends.server.types.operation.PostOperationDeleteOperation;
import static org.opends.messages.PluginMessages.*;
-import static org.opends.server.loggers.ErrorLogger.*;
import static org.opends.server.schema.SchemaConstants.*;
import static org.opends.server.util.StaticUtils.*;
@@ -245,7 +244,7 @@
/* This should never happen because the filter has already
* been verified.
*/
- logError(de.getMessageObject());
+ logger.error(de.getMessageObject());
}
}
@@ -716,14 +715,13 @@
break;
case NO_SUCH_OBJECT:
- logError(INFO_PLUGIN_REFERENT_SEARCH_NO_SUCH_OBJECT.get(
- baseDN.toString()));
+ logger.debug(INFO_PLUGIN_REFERENT_SEARCH_NO_SUCH_OBJECT.get(baseDN.toString()));
return;
default:
LocalizableMessage message1 = ERR_PLUGIN_REFERENT_SEARCH_FAILED.
get(String.valueOf(operation.getErrorMessage()));
- logError(message1);
+ logger.error(message1);
return;
}
@@ -817,7 +815,7 @@
conn.processModify(entryDN, mods);
if(modifyOperation.getResultCode() != ResultCode.SUCCESS)
{
- logError(ERR_PLUGIN_REFERENT_MODIFY_FAILED.get(entryDN.toString(),
+ logger.error(ERR_PLUGIN_REFERENT_MODIFY_FAILED.get(entryDN.toString(),
String.valueOf(modifyOperation.getErrorMessage())));
}
}
@@ -903,7 +901,7 @@
}
catch (IOException io)
{
- logError(ERR_PLUGIN_REFERENT_CLOSE_LOGFILE.get(io.getMessage()));
+ logger.error(ERR_PLUGIN_REFERENT_CLOSE_LOGFILE.get(io.getMessage()));
}
}
}
@@ -931,7 +929,7 @@
}
catch (IOException io)
{
- logError(ERR_PLUGIN_REFERENT_CLOSE_LOGFILE.get(io.getMessage()));
+ logger.error(ERR_PLUGIN_REFERENT_CLOSE_LOGFILE.get(io.getMessage()));
}
}
}
@@ -970,17 +968,14 @@
} catch (DirectoryException ex) {
//This exception should rarely happen since the plugin wrote the DN
//strings originally.
- LocalizableMessage message=
- ERR_PLUGIN_REFERENT_CANNOT_DECODE_STRING_AS_DN.
- get(ex.getMessage());
- logError(message);
+ logger.error(ERR_PLUGIN_REFERENT_CANNOT_DECODE_STRING_AS_DN, ex.getMessage());
}
}
reader.close();
logFile.delete();
logFile.createNewFile();
} catch (IOException io) {
- logError(ERR_PLUGIN_REFERENT_REPLACE_LOGFILE.get(io.getMessage()));
+ logger.error(ERR_PLUGIN_REFERENT_REPLACE_LOGFILE.get(io.getMessage()));
}
}
}
--
Gitblit v1.10.0