Fix Issue 3585 Network Group Resource Limit: should be able to define resou...

floblanc

12.28.2008 0acc4fd035de7ea6715bd9ec33553740cdb50534

Fix Issue 3585 Network Group Resource Limit: should be able to define resource limits with no size/time limit
The network group time/size limits now have no default value.

 opends/src/admin/defn/org/opends/server/admin/std/NetworkGroupResourceLimitsConfiguration.xml

@@ -149,9 +149,11 @@
      per-user basis.
    </adm:description>
    <adm:default-behavior>
      <adm:defined>
        <adm:value>1000</adm:value>
      </adm:defined>
      <adm:alias>
        <adm:synopsis>
          Use the global default size limit.
        </adm:synopsis>
      </adm:alias>
    </adm:default-behavior>
    <adm:syntax>
      <adm:integer lower-limit="0"/>
@@ -174,9 +176,11 @@
      on a per-user basis.
    </adm:description>
    <adm:default-behavior>
      <adm:defined>
        <adm:value>60 seconds</adm:value>
      </adm:defined>
      <adm:alias>
        <adm:synopsis>
          Use the global default time limit.
        </adm:synopsis>
      </adm:alias>
    </adm:default-behavior>
    <adm:syntax>
      <adm:duration base-unit="s" lower-limit="0" />
@@ -301,4 +305,4 @@
    </adm:profile>
  </adm:property>

</adm:managed-object>
</adm:managed-object>

 opends/src/server/org/opends/server/core/networkgroups/ResourceLimits.java

@@ -138,8 +138,18 @@
      maxConcurrentOpsPerConnection =
            resourcesCfg.getMaxConcurrentOpsPerConnection();

      searchSizeLimit = resourcesCfg.getSearchSizeLimit();
      searchTimeLimit = (int) resourcesCfg.getSearchTimeLimit();
      Integer tmpSizeLimit = resourcesCfg.getSearchSizeLimit();
      if (tmpSizeLimit != null) {
        searchSizeLimit = tmpSizeLimit;
      } else {
        searchSizeLimit = -1;
      }
      Long tmpTimeLimit = resourcesCfg.getSearchTimeLimit();
      if (tmpTimeLimit != null) {
        searchTimeLimit = tmpTimeLimit.intValue();
      } else {
        searchTimeLimit = -1;
      }
      minSearchSubstringLength = resourcesCfg.getMinSubstringLength();

      if (config == null) {