From 055de6b29cc22e4f8d5786405694dba6e113321d Mon Sep 17 00:00:00 2001
From: neil_a_wilson <neil_a_wilson@localhost>
Date: Fri, 04 May 2007 01:31:44 +0000
Subject: [PATCH] Fix configuration problems that would cause the server to fail to start if an entry cache was enabled.
---
opends/src/server/org/opends/server/extensions/EntryCacheCommon.java | 2 +-
opends/src/server/org/opends/server/extensions/FIFOEntryCache.java | 2 +-
opends/src/admin/defn/org/opends/server/admin/std/FIFOEntryCacheConfiguration.xml | 6 +++---
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/opends/src/admin/defn/org/opends/server/admin/std/FIFOEntryCacheConfiguration.xml b/opends/src/admin/defn/org/opends/server/admin/std/FIFOEntryCacheConfiguration.xml
index f6d3f2e..e43e3fc 100644
--- a/opends/src/admin/defn/org/opends/server/admin/std/FIFOEntryCacheConfiguration.xml
+++ b/opends/src/admin/defn/org/opends/server/admin/std/FIFOEntryCacheConfiguration.xml
@@ -102,7 +102,7 @@
</adm:defined>
</adm:default-behavior>
<adm:syntax>
- <adm:size lower-limit="1" upper-limit="100"/>
+ <adm:integer lower-limit="1" upper-limit="100"/>
</adm:syntax>
<adm:profile name="ldap">
<ldap:attribute>
@@ -118,11 +118,11 @@
</adm:synopsis>
<adm:default-behavior>
<adm:defined>
- <adm:value>0x7fffffffffffffffL</adm:value>
+ <adm:value>2147483647</adm:value>
</adm:defined>
</adm:default-behavior>
<adm:syntax>
- <adm:size lower-limit="0" allow-unlimited="true"/>
+ <adm:integer lower-limit="0" />
</adm:syntax>
<adm:profile name="ldap">
<ldap:attribute>
diff --git a/opends/src/server/org/opends/server/extensions/EntryCacheCommon.java b/opends/src/server/org/opends/server/extensions/EntryCacheCommon.java
index af0f3ab..10abc6f 100644
--- a/opends/src/server/org/opends/server/extensions/EntryCacheCommon.java
+++ b/opends/src/server/org/opends/server/extensions/EntryCacheCommon.java
@@ -254,7 +254,7 @@
HashSet<SearchFilter> searchFilters = new HashSet<SearchFilter>();
// Convert the string filters to search filters.
- if (filters != null)
+ if ((filters != null) && (! filters.isEmpty()))
{
for (String curFilter: filters)
{
diff --git a/opends/src/server/org/opends/server/extensions/FIFOEntryCache.java b/opends/src/server/org/opends/server/extensions/FIFOEntryCache.java
index 53bfa87..cc0bc9b 100644
--- a/opends/src/server/org/opends/server/extensions/FIFOEntryCache.java
+++ b/opends/src/server/org/opends/server/extensions/FIFOEntryCache.java
@@ -1432,7 +1432,7 @@
newMaxEntries = configuration.getMaxEntries();
// Maximum memory the cache can use.
- newMaxMemoryPercent = (int) configuration.getMaxMemoryPercent();
+ newMaxMemoryPercent = configuration.getMaxMemoryPercent();
long maxJvmHeapSize = Runtime.getRuntime().maxMemory();
newMaxAllowedMemory = (maxJvmHeapSize / 100) * newMaxMemoryPercent;
--
Gitblit v1.10.0