From cf55b5e024f9ec9affadd85caa7a333e0fa2eafe Mon Sep 17 00:00:00 2001
From: floblanc <floblanc@localhost>
Date: Wed, 12 Nov 2008 16:28:08 +0000
Subject: [PATCH] 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.
---
opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/NetworkGroupResourceLimitsConfiguration.xml | 18 +++++++++++-------
opendj-sdk/opends/src/server/org/opends/server/core/networkgroups/ResourceLimits.java | 14 ++++++++++++--
2 files changed, 23 insertions(+), 9 deletions(-)
diff --git a/opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/NetworkGroupResourceLimitsConfiguration.xml b/opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/NetworkGroupResourceLimitsConfiguration.xml
index c31e2e9..cd502cd 100644
--- a/opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/NetworkGroupResourceLimitsConfiguration.xml
+++ b/opendj-sdk/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>
\ No newline at end of file
+</adm:managed-object>
diff --git a/opendj-sdk/opends/src/server/org/opends/server/core/networkgroups/ResourceLimits.java b/opendj-sdk/opends/src/server/org/opends/server/core/networkgroups/ResourceLimits.java
index 9904e93..b8687f8 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/core/networkgroups/ResourceLimits.java
+++ b/opendj-sdk/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) {
--
Gitblit v1.10.0