From a22cdf4b1a370dc9ae9f92837f9946c17f2e7ebd Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Fri, 07 Feb 2014 11:41:32 +0000
Subject: [PATCH] Replaced such calls: LocalizedLogger.*(ArgN.get()); by this: LocalizedLogger.*(ArgN);
---
opendj3-server-dev/src/server/org/opends/server/core/DirectoryServer.java | 4 +-
opendj3-server-dev/src/server/org/opends/server/core/EntryCacheConfigManager.java | 4 +-
opendj3-server-dev/src/server/org/opends/server/extensions/FileSystemEntryCache.java | 33 +++-------------
opendj3-server-dev/src/server/org/opends/server/core/LoggerConfigManager.java | 4 +-
opendj3-server-dev/src/server/org/opends/server/replication/plugin/LDAPReplicationDomain.java | 4 +-
opendj3-server-dev/src/server/org/opends/server/extensions/GSSAPISASLMechanismHandler.java | 2
opendj3-server-dev/src/server/org/opends/server/protocols/http/HTTPConnectionHandler.java | 2
opendj3-server-dev/src/server/org/opends/server/util/RuntimeInformation.java | 4 +-
opendj3-server-dev/src/server/org/opends/server/replication/server/ReplicationServer.java | 2
opendj3-server-dev/src/server/org/opends/server/core/IdentityMapperConfigManager.java | 2
opendj3-server-dev/src/server/org/opends/server/tools/upgrade/UpgradeTasks.java | 2
11 files changed, 21 insertions(+), 42 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/core/DirectoryServer.java b/opendj3-server-dev/src/server/org/opends/server/core/DirectoryServer.java
index 497e5ae..6e473f1 100644
--- a/opendj3-server-dev/src/server/org/opends/server/core/DirectoryServer.java
+++ b/opendj3-server-dev/src/server/org/opends/server/core/DirectoryServer.java
@@ -1004,7 +1004,7 @@
initializeJMX();
- logger.debug(INFO_DIRECTORY_BOOTSTRAPPING.get());
+ logger.debug(INFO_DIRECTORY_BOOTSTRAPPING);
// Perform all the bootstrapping that is shared with the client-side
@@ -8095,7 +8095,7 @@
// Log a final message indicating that the server is stopped (which should
// be true for all practical purposes), and then shut down all the error
// loggers.
- logger.info(NOTE_SERVER_STOPPED.get());
+ logger.info(NOTE_SERVER_STOPPED);
AccessLogger.getInstance().removeAllLogPublishers();
ErrorLogger.getInstance().removeAllLogPublishers();
diff --git a/opendj3-server-dev/src/server/org/opends/server/core/EntryCacheConfigManager.java b/opendj3-server-dev/src/server/org/opends/server/core/EntryCacheConfigManager.java
index e61c155..5fe590f 100644
--- a/opendj3-server-dev/src/server/org/opends/server/core/EntryCacheConfigManager.java
+++ b/opendj3-server-dev/src/server/org/opends/server/core/EntryCacheConfigManager.java
@@ -160,7 +160,7 @@
} catch (Exception e) {
logger.traceException(e);
- logger.warn(WARN_CONFIG_ENTRYCACHE_NO_CONFIG_ENTRY.get());
+ logger.warn(WARN_CONFIG_ENTRYCACHE_NO_CONFIG_ENTRY);
return;
}
@@ -169,7 +169,7 @@
// no entry cache defined below it.
if (entryCacheBase == null)
{
- logger.error(WARN_CONFIG_ENTRYCACHE_NO_CONFIG_ENTRY.get());
+ logger.error(WARN_CONFIG_ENTRYCACHE_NO_CONFIG_ENTRY);
return;
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/core/IdentityMapperConfigManager.java b/opendj3-server-dev/src/server/org/opends/server/core/IdentityMapperConfigManager.java
index 0c45d06..02a4bc6 100644
--- a/opendj3-server-dev/src/server/org/opends/server/core/IdentityMapperConfigManager.java
+++ b/opendj3-server-dev/src/server/org/opends/server/core/IdentityMapperConfigManager.java
@@ -144,7 +144,7 @@
DN mapperDN = DirectoryServer.getProxiedAuthorizationIdentityMapperDN();
if (mapperDN == null)
{
- logger.error(ERR_CONFIG_IDMAPPER_NO_PROXY_MAPPER_DN.get());
+ logger.error(ERR_CONFIG_IDMAPPER_NO_PROXY_MAPPER_DN);
}
else if (! identityMappers.containsKey(mapperDN))
{
diff --git a/opendj3-server-dev/src/server/org/opends/server/core/LoggerConfigManager.java b/opendj3-server-dev/src/server/org/opends/server/core/LoggerConfigManager.java
index 22e4f3e..bcc4631 100644
--- a/opendj3-server-dev/src/server/org/opends/server/core/LoggerConfigManager.java
+++ b/opendj3-server-dev/src/server/org/opends/server/core/LoggerConfigManager.java
@@ -148,11 +148,11 @@
// disable all debug loggers.
if (accessPublisherCfgs.isEmpty())
{
- logger.warn(WARN_CONFIG_LOGGER_NO_ACTIVE_ACCESS_LOGGERS.get());
+ logger.warn(WARN_CONFIG_LOGGER_NO_ACTIVE_ACCESS_LOGGERS);
}
if (errorPublisherCfgs.isEmpty())
{
- logger.warn(WARN_CONFIG_LOGGER_NO_ACTIVE_ERROR_LOGGERS.get());
+ logger.warn(WARN_CONFIG_LOGGER_NO_ACTIVE_ERROR_LOGGERS);
}
DebugLogger.getInstance().initializeLogger(debugPublisherCfgs, serverContext);
diff --git a/opendj3-server-dev/src/server/org/opends/server/extensions/FileSystemEntryCache.java b/opendj3-server-dev/src/server/org/opends/server/extensions/FileSystemEntryCache.java
index a5d7714..7052357 100644
--- a/opendj3-server-dev/src/server/org/opends/server/extensions/FileSystemEntryCache.java
+++ b/opendj3-server-dev/src/server/org/opends/server/extensions/FileSystemEntryCache.java
@@ -345,7 +345,6 @@
if ( !(offlineId.equals(currentId)) ) {
// Remove cache entries specific to this backend.
clearBackend(DirectoryServer.getBackend(backend));
- // Log an error message.
logger.warn(WARN_FSCACHE_OFFLINE_STATE_FAIL, backend);
}
}
@@ -358,27 +357,15 @@
} catch (CacheIndexNotFoundException e) {
logger.traceException(e);
-
- // Log an error message.
- logger.info(NOTE_FSCACHE_INDEX_NOT_FOUND.get());
-
- // Clear the entry cache.
+ logger.info(NOTE_FSCACHE_INDEX_NOT_FOUND);
clear();
} catch (CacheIndexImpairedException e) {
logger.traceException(e);
-
- // Log an error message.
- logger.error(ERR_FSCACHE_INDEX_IMPAIRED.get());
-
- // Clear the entry cache.
+ logger.error(ERR_FSCACHE_INDEX_IMPAIRED);
clear();
} catch (Exception e) {
logger.traceException(e);
-
- // Log an error message.
- logger.error(ERR_FSCACHE_CANNOT_LOAD_PERSISTENT_DATA.get());
-
- // Clear the entry cache.
+ logger.error(ERR_FSCACHE_CANNOT_LOAD_PERSISTENT_DATA);
clear();
}
}
@@ -435,9 +422,7 @@
}
} catch (Exception e) {
logger.traceException(e);
-
- // Log an error message.
- logger.error(ERR_FSCACHE_CANNOT_STORE_PERSISTENT_DATA.get());
+ logger.error(ERR_FSCACHE_CANNOT_STORE_PERSISTENT_DATA);
}
// Persistent state save report.
@@ -1269,9 +1254,7 @@
}
} catch (Exception e) {
logger.traceException(e);
-
- // Log an error message.
- logger.error(ERR_FSCACHE_CANNOT_RETRIEVE_ENTRY.get());
+ logger.error(ERR_FSCACHE_CANNOT_RETRIEVE_ENTRY);
}
return null;
}
@@ -1354,11 +1337,7 @@
return true;
} catch (Exception e) {
logger.traceException(e);
-
- // Log an error message.
- logger.error(
- ERR_FSCACHE_CANNOT_STORE_ENTRY.get());
-
+ logger.error(ERR_FSCACHE_CANNOT_STORE_ENTRY);
return false;
} finally {
if (cacheLock.isWriteLockedByCurrentThread()) {
diff --git a/opendj3-server-dev/src/server/org/opends/server/extensions/GSSAPISASLMechanismHandler.java b/opendj3-server-dev/src/server/org/opends/server/extensions/GSSAPISASLMechanismHandler.java
index 419d164..e0e77d2 100644
--- a/opendj3-server-dev/src/server/org/opends/server/extensions/GSSAPISASLMechanismHandler.java
+++ b/opendj3-server-dev/src/server/org/opends/server/extensions/GSSAPISASLMechanismHandler.java
@@ -347,7 +347,7 @@
}
DirectoryServer.deregisterSASLMechanismHandler(SASL_MECHANISM_GSSAPI);
clearProperties();
- logger.error(INFO_GSSAPI_STOPPED.get());
+ logger.error(INFO_GSSAPI_STOPPED);
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/protocols/http/HTTPConnectionHandler.java b/opendj3-server-dev/src/server/org/opends/server/protocols/http/HTTPConnectionHandler.java
index 86d4571..3f0e41f 100644
--- a/opendj3-server-dev/src/server/org/opends/server/protocols/http/HTTPConnectionHandler.java
+++ b/opendj3-server-dev/src/server/org/opends/server/protocols/http/HTTPConnectionHandler.java
@@ -760,7 +760,7 @@
if (HTTPAccessLogger.getHTTPAccessLogPublishers().isEmpty())
{
- logger.warn(WARN_CONFIG_LOGGER_NO_ACTIVE_HTTP_ACCESS_LOGGERS.get());
+ logger.warn(WARN_CONFIG_LOGGER_NO_ACTIVE_HTTP_ACCESS_LOGGERS);
}
this.httpServer = createHttpServer();
diff --git a/opendj3-server-dev/src/server/org/opends/server/replication/plugin/LDAPReplicationDomain.java b/opendj3-server-dev/src/server/org/opends/server/replication/plugin/LDAPReplicationDomain.java
index 7312145..5714ed4 100644
--- a/opendj3-server-dev/src/server/org/opends/server/replication/plugin/LDAPReplicationDomain.java
+++ b/opendj3-server-dev/src/server/org/opends/server/replication/plugin/LDAPReplicationDomain.java
@@ -387,7 +387,7 @@
{
// Replication server is missing some of our changes: let's
// send them to him.
- logger.trace(DEBUG_GOING_TO_SEARCH_FOR_CHANGES.get());
+ logger.trace(DEBUG_GOING_TO_SEARCH_FOR_CHANGES);
/*
* Get all the changes that have not been seen by this
@@ -397,7 +397,7 @@
{
if (buildAndPublishMissingChanges(startCSN, broker, shutdown))
{
- logger.trace(DEBUG_CHANGES_SENT.get());
+ logger.trace(DEBUG_CHANGES_SENT);
synchronized(replayOperations)
{
replayOperations.clear();
diff --git a/opendj3-server-dev/src/server/org/opends/server/replication/server/ReplicationServer.java b/opendj3-server-dev/src/server/org/opends/server/replication/server/ReplicationServer.java
index 814f98c..bb09fdd 100644
--- a/opendj3-server-dev/src/server/org/opends/server/replication/server/ReplicationServer.java
+++ b/opendj3-server-dev/src/server/org/opends/server/replication/server/ReplicationServer.java
@@ -424,7 +424,7 @@
" successfully initialized");
} catch (UnknownHostException e)
{
- logger.error(ERR_UNKNOWN_HOSTNAME.get());
+ logger.error(ERR_UNKNOWN_HOSTNAME);
} catch (IOException e)
{
logger.error(ERR_COULD_NOT_BIND_CHANGELOG, getReplicationPort(), e.getMessage());
diff --git a/opendj3-server-dev/src/server/org/opends/server/tools/upgrade/UpgradeTasks.java b/opendj3-server-dev/src/server/org/opends/server/tools/upgrade/UpgradeTasks.java
index c48a71e..a2daed2 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tools/upgrade/UpgradeTasks.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tools/upgrade/UpgradeTasks.java
@@ -658,7 +658,7 @@
if (result == 0)
{
- logger.debug(INFO_UPGRADE_REBUILD_INDEX_ENDS.get());
+ logger.debug(INFO_UPGRADE_REBUILD_INDEX_ENDS);
context.notifyProgress(pnc.setProgress(100));
}
else
diff --git a/opendj3-server-dev/src/server/org/opends/server/util/RuntimeInformation.java b/opendj3-server-dev/src/server/org/opends/server/util/RuntimeInformation.java
index ed899dd..6046382 100644
--- a/opendj3-server-dev/src/server/org/opends/server/util/RuntimeInformation.java
+++ b/opendj3-server-dev/src/server/org/opends/server/util/RuntimeInformation.java
@@ -264,7 +264,7 @@
String installDir = toCanonicalPath(DirectoryServer.getServerRoot());
if (installDir == null)
{
- logger.info(NOTE_UNKNOWN_INSTALL_DIRECTORY.get());
+ logger.info(NOTE_UNKNOWN_INSTALL_DIRECTORY);
}
else
{
@@ -273,7 +273,7 @@
String instanceDir = toCanonicalPath(DirectoryServer.getInstanceRoot());
if (instanceDir == null)
{
- logger.info(NOTE_UNKNOWN_INSTANCE_DIRECTORY.get());
+ logger.info(NOTE_UNKNOWN_INSTANCE_DIRECTORY);
}
else
{
--
Gitblit v1.10.0