From 37057adc0f58b9d747ba3834180ce06d582e3f14 Mon Sep 17 00:00:00 2001
From: abobrov <abobrov@localhost>
Date: Sat, 09 Jun 2007 15:58:05 +0000
Subject: [PATCH] - [Issue 1768] Invalid fallback behavior for FS Entry Cache - [Issue 1767] Checksum error message on startup - Set eol-style to native
---
opends/src/server/org/opends/server/extensions/FileSystemEntryCache.java | 29 ++++++++---------------------
1 files changed, 8 insertions(+), 21 deletions(-)
diff --git a/opends/src/server/org/opends/server/extensions/FileSystemEntryCache.java b/opends/src/server/org/opends/server/extensions/FileSystemEntryCache.java
index 365a1a4..63878b8 100644
--- a/opends/src/server/org/opends/server/extensions/FileSystemEntryCache.java
+++ b/opends/src/server/org/opends/server/extensions/FileSystemEntryCache.java
@@ -305,27 +305,14 @@
// Log an error message.
logError(ErrorLogCategory.CONFIGURATION,
ErrorLogSeverity.SEVERE_ERROR,
- MSGID_FSCACHE_INVALID_HOME,
- String.valueOf(configEntryDN), stackTraceToSingleLineString(e),
- cacheHome, DEFAULT_FSCACHE_HOME);
+ MSGID_FSCACHE_HOMELESS,
+ String.valueOf(configEntryDN), stackTraceToSingleLineString(e));
- // User specified home is no good, reset to default.
- cacheHome = DEFAULT_FSCACHE_HOME;
-
- // Try again.
- try {
- checkAndSetupCacheHome(cacheHome);
- } catch (Exception e2) {
- // Not having any home for the cache db environment at this point is a
- // fatal error as we are unable to continue any further without it.
- if (debugEnabled()) {
- TRACER.debugCaught(DebugLogLevel.ERROR, e2);
- }
-
- int msgID = MSGID_FSCACHE_HOMELESS;
- String message = getMessage(msgID, stackTraceToSingleLineString(e2));
- throw new InitializationException(msgID, message, e2);
- }
+ // Not having any home directory for the cache db environment is a
+ // fatal error as we are unable to continue any further without it.
+ int msgID = MSGID_FSCACHE_HOMELESS;
+ String message = getMessage(msgID, stackTraceToSingleLineString(e));
+ throw new InitializationException(msgID, message, e);
}
// Open JE environment and cache database.
@@ -2268,7 +2255,7 @@
throw new Exception();
}
} catch(Exception e) {
- // Log an warning that the permissions were not set.
+ // Log a warning that the permissions were not set.
int msgID = MSGID_FSCACHE_SET_PERMISSIONS_FAILED;
String message = getMessage(msgID, cacheHome);
logError(ErrorLogCategory.EXTENSIONS, ErrorLogSeverity.SEVERE_WARNING,
--
Gitblit v1.10.0