From 80c58327faaa4873369f6bb949e62792c2f708e0 Mon Sep 17 00:00:00 2001
From: kenneth_suter <kenneth_suter@localhost>
Date: Wed, 15 Aug 2007 21:34:53 +0000
Subject: [PATCH] This commit is a step toward getting OpenDS internationalized. There are still issues to be resolved before we can declare that we are internationalized but this commit covers the bulk of changes needed at this time.
---
opends/src/server/org/opends/server/core/LockFileManager.java | 65 +++++++++++++++-----------------
1 files changed, 31 insertions(+), 34 deletions(-)
diff --git a/opends/src/server/org/opends/server/core/LockFileManager.java b/opends/src/server/org/opends/server/core/LockFileManager.java
index 5bb1fdd..da15e4a 100644
--- a/opends/src/server/org/opends/server/core/LockFileManager.java
+++ b/opends/src/server/org/opends/server/core/LockFileManager.java
@@ -40,8 +40,7 @@
import static org.opends.server.loggers.debug.DebugLogger.*;
import org.opends.server.loggers.debug.DebugTracer;
import org.opends.server.types.DebugLogLevel;
-import static org.opends.server.messages.CoreMessages.*;
-import static org.opends.server.messages.MessageHandler.*;
+import static org.opends.messages.CoreMessages.*;
import static org.opends.server.util.ServerConstants.*;
import static org.opends.server.util.StaticUtils.*;
@@ -100,8 +99,9 @@
// then we can't get a shared lock on it.
if (exclusiveLocks.containsKey(lockFile))
{
- int msgID = MSGID_FILELOCKER_LOCK_SHARED_REJECTED_BY_EXCLUSIVE;
- failureReason.append(getMessage(msgID, lockFile));
+
+ failureReason.append(
+ ERR_FILELOCKER_LOCK_SHARED_REJECTED_BY_EXCLUSIVE.get(lockFile));
return false;
}
@@ -135,8 +135,8 @@
TRACER.debugCaught(DebugLogLevel.ERROR, e);
}
- int msgID = MSGID_FILELOCKER_LOCK_SHARED_FAILED_CREATE;
- failureReason.append(getMessage(msgID, lockFile,
+ failureReason.append(
+ ERR_FILELOCKER_LOCK_SHARED_FAILED_CREATE.get(lockFile,
getExceptionMessage(e)));
return false;
}
@@ -157,9 +157,8 @@
TRACER.debugCaught(DebugLogLevel.ERROR, e);
}
- int msgID = MSGID_FILELOCKER_LOCK_SHARED_FAILED_OPEN;
- failureReason.append(getMessage(msgID, lockFile,
- getExceptionMessage(e)));
+ failureReason.append(ERR_FILELOCKER_LOCK_SHARED_FAILED_OPEN.get(
+ lockFile, getExceptionMessage(e)));
if (raf != null)
{
@@ -188,8 +187,9 @@
TRACER.debugCaught(DebugLogLevel.ERROR, e);
}
- int msgID = MSGID_FILELOCKER_LOCK_SHARED_FAILED_LOCK;
- failureReason.append(getMessage(msgID, getExceptionMessage(e)));
+ failureReason.append(
+ ERR_FILELOCKER_LOCK_SHARED_FAILED_LOCK.get(
+ lockFile, getExceptionMessage(e)));
if (channel != null)
{
try
@@ -218,8 +218,8 @@
// the shared lock table with a reference count of 1 and return true.
if (fileLock == null)
{
- int msgID = MSGID_FILELOCKER_LOCK_SHARED_NOT_GRANTED;
- failureReason.append(getMessage(msgID, lockFile));
+ failureReason.append(
+ ERR_FILELOCKER_LOCK_SHARED_NOT_GRANTED.get(lockFile));
if (channel != null)
{
try
@@ -278,8 +278,9 @@
// then we can't get another exclusive lock on it.
if (exclusiveLocks.containsKey(lockFile))
{
- int msgID = MSGID_FILELOCKER_LOCK_EXCLUSIVE_REJECTED_BY_EXCLUSIVE;
- failureReason.append(getMessage(msgID, lockFile));
+ failureReason.append(
+ ERR_FILELOCKER_LOCK_EXCLUSIVE_REJECTED_BY_EXCLUSIVE.get(
+ lockFile));
return false;
}
@@ -288,8 +289,8 @@
// we can't get an exclusive lock on it.
if (sharedLocks.containsKey(lockFile))
{
- int msgID = MSGID_FILELOCKER_LOCK_EXCLUSIVE_REJECTED_BY_SHARED;
- failureReason.append(getMessage(msgID, lockFile));
+ failureReason.append(
+ ERR_FILELOCKER_LOCK_EXCLUSIVE_REJECTED_BY_SHARED.get(lockFile));
return false;
}
@@ -310,9 +311,8 @@
{
TRACER.debugCaught(DebugLogLevel.ERROR, e);
}
-
- int msgID = MSGID_FILELOCKER_LOCK_EXCLUSIVE_FAILED_CREATE;
- failureReason.append(getMessage(msgID, lockFile,
+ failureReason.append(
+ ERR_FILELOCKER_LOCK_EXCLUSIVE_FAILED_CREATE.get(lockFile,
getExceptionMessage(e)));
return false;
}
@@ -333,9 +333,8 @@
TRACER.debugCaught(DebugLogLevel.ERROR, e);
}
- int msgID = MSGID_FILELOCKER_LOCK_EXCLUSIVE_FAILED_OPEN;
- failureReason.append(getMessage(msgID, lockFile,
- getExceptionMessage(e)));
+ failureReason.append(ERR_FILELOCKER_LOCK_EXCLUSIVE_FAILED_OPEN.get(
+ lockFile, getExceptionMessage(e)));
if (raf != null)
{
try
@@ -363,8 +362,8 @@
TRACER.debugCaught(DebugLogLevel.ERROR, e);
}
- int msgID = MSGID_FILELOCKER_LOCK_EXCLUSIVE_FAILED_LOCK;
- failureReason.append(getMessage(msgID, lockFile,
+ failureReason.append(
+ ERR_FILELOCKER_LOCK_EXCLUSIVE_FAILED_LOCK.get(lockFile,
getExceptionMessage(e)));
if (channel != null)
{
@@ -395,8 +394,8 @@
// the exclusive lock table and return true.
if (fileLock == null)
{
- int msgID = MSGID_FILELOCKER_LOCK_EXCLUSIVE_NOT_GRANTED;
- failureReason.append(getMessage(msgID, lockFile));
+ failureReason.append(
+ ERR_FILELOCKER_LOCK_EXCLUSIVE_NOT_GRANTED.get(lockFile));
if (channel != null)
{
try
@@ -472,8 +471,8 @@
TRACER.debugCaught(DebugLogLevel.ERROR, e);
}
- int msgID = MSGID_FILELOCKER_UNLOCK_EXCLUSIVE_FAILED_RELEASE;
- failureReason.append(getMessage(msgID, lockFile,
+ failureReason.append(
+ ERR_FILELOCKER_UNLOCK_EXCLUSIVE_FAILED_RELEASE.get(lockFile,
getExceptionMessage(e)));
return false;
}
@@ -520,9 +519,8 @@
TRACER.debugCaught(DebugLogLevel.ERROR, e);
}
- int msgID = MSGID_FILELOCKER_UNLOCK_SHARED_FAILED_RELEASE;
- failureReason.append(getMessage(msgID, lockFile,
- getExceptionMessage(e)));
+ failureReason.append(ERR_FILELOCKER_UNLOCK_SHARED_FAILED_RELEASE
+ .get(lockFile, getExceptionMessage(e)));
return false;
}
@@ -553,8 +551,7 @@
// We didn't find a reference to the file. We'll have to return false
// since either we lost the reference or we're trying to release a lock
// we never had. Both of them are bad.
- int msgID = MSGID_FILELOCKER_UNLOCK_UNKNOWN_FILE;
- failureReason.append(getMessage(msgID, lockFile));
+ failureReason.append(ERR_FILELOCKER_UNLOCK_UNKNOWN_FILE.get(lockFile));
return false;
}
finally
--
Gitblit v1.10.0