From a8f5d8345278d27ddf5325d3977e460b86b6275f Mon Sep 17 00:00:00 2001
From: ludovicp <ludovicp@localhost>
Date: Tue, 27 Apr 2010 20:56:50 +0000
Subject: [PATCH] Fixing several issues with the Control Panel, the QuickSetup, Core server and Replication. Also improves unit, functional tests. More specifically this commit resolves the following open issues: 4385 - NPE when using ExtensibleMatch filter without a matching rule 4521 - dynamic lookup in attribut selection when selecting the sort order attribut while defining VLV index 4531 - Control Panel creates virtual static groups using groupOfURLs as objectclass 4533 - NullPointerException when configuring replication between 2 OpenDS 4539 - DSML Gateway - jaxb.properties Exception
---
opends/src/quicksetup/org/opends/quicksetup/UserData.java | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/opends/src/quicksetup/org/opends/quicksetup/UserData.java b/opends/src/quicksetup/org/opends/quicksetup/UserData.java
index 468978c..2260c03 100644
--- a/opends/src/quicksetup/org/opends/quicksetup/UserData.java
+++ b/opends/src/quicksetup/org/opends/quicksetup/UserData.java
@@ -824,6 +824,7 @@
{
hmJavaArguments = new HashMap<String, JavaArguments>();
int maxMemoryMb = 256;
+ int minMemoryMb = 128;
final int maxMemoryBytes = maxMemoryMb * 1024 * 1024;
// If the current max memory is bigger than the max heap we want to set,
// assume that the JVM ergonomics are going to be able to allocate enough
@@ -832,6 +833,7 @@
if (currentMaxMemoryBytes > maxMemoryBytes)
{
maxMemoryMb = -1;
+ minMemoryMb = -1;
}
for (String clientScript : getClientScripts())
{
@@ -843,8 +845,8 @@
for (String serverScript : getServerScripts())
{
JavaArguments javaArgument = new JavaArguments();
- javaArgument.setInitialMemory(128);
- javaArgument.setMaxMemory(256);
+ javaArgument.setInitialMemory(minMemoryMb);
+ javaArgument.setMaxMemory(maxMemoryMb);
javaArgument.setAdditionalArguments(new String[] {"-server"});
hmJavaArguments.put(serverScript, javaArgument);
}
--
Gitblit v1.10.0