From 5c270973c01ffbdcd9f884deacafeb11d1edf200 Mon Sep 17 00:00:00 2001
From: abobrov <abobrov@localhost>
Date: Sun, 26 Aug 2007 01:10:02 +0000
Subject: [PATCH] - fix entry cache mutable properties [properties that can be changed on the fly without any admin action required] functionality which got broken presumably when migrating to new admin framework.
---
opends/src/server/org/opends/server/extensions/FileSystemEntryCache.java | 15 +++++++--------
1 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/opends/src/server/org/opends/server/extensions/FileSystemEntryCache.java b/opends/src/server/org/opends/server/extensions/FileSystemEntryCache.java
index a75f5c7..c9a8d81 100644
--- a/opends/src/server/org/opends/server/extensions/FileSystemEntryCache.java
+++ b/opends/src/server/org/opends/server/extensions/FileSystemEntryCache.java
@@ -1051,8 +1051,6 @@
List<Message> unacceptableReasons
)
{
- // Make sure that we can process the defined character sets. If so, then
- // we'll accept the new configuration.
boolean applyChanges = false;
EntryCacheCommon.ConfigErrorHandler errorHandler =
EntryCacheCommon.getConfigErrorHandler (
@@ -1072,9 +1070,7 @@
FileSystemEntryCacheCfg configuration
)
{
- // Make sure that we can process the defined character sets. If so, then
- // activate the new configuration.
- boolean applyChanges = false;
+ boolean applyChanges = true;
ArrayList<Message> errorMessages = new ArrayList<Message>();
EntryCacheCommon.ConfigErrorHandler errorHandler =
EntryCacheCommon.getConfigErrorHandler (
@@ -1296,8 +1292,10 @@
case PHASE_APPLY:
jeCachePercent = newJECachePercent;
try {
- EnvironmentConfig envConfig = entryCacheEnv.getConfig();
- envConfig.setCachePercent(jeCachePercent);
+ EnvironmentMutableConfig envConfig =
+ entryCacheEnv.getMutableConfig();
+ envConfig.setCachePercent((jeCachePercent != 0 ? jeCachePercent :
+ EnvironmentConfig.DEFAULT.getCachePercent()));
entryCacheEnv.setMutableConfig(envConfig);
entryCacheEnv.evictMemory();
} catch (Exception e) {
@@ -1312,7 +1310,8 @@
}
jeCacheSize = newJECacheSize;
try {
- EnvironmentConfig envConfig = entryCacheEnv.getConfig();
+ EnvironmentMutableConfig envConfig =
+ entryCacheEnv.getMutableConfig();
envConfig.setCacheSize(jeCacheSize);
entryCacheEnv.setMutableConfig(envConfig);
entryCacheEnv.evictMemory();
--
Gitblit v1.10.0