Fix configuration problems that would cause the server to fail to start if ...

neil_a_wilson

04.31.2007 055de6b29cc22e4f8d5786405694dba6e113321d

Fix configuration problems that would cause the server to fail to start if an
entry cache was enabled.

 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>

 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)
      {

 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;