From bffeb78279ded6c57eb050f7237201ad93f8a4c2 Mon Sep 17 00:00:00 2001
From: vharseko <vharseko@3a-systems.ru>
Date: Tue, 18 Jul 2023 16:23:17 +0000
Subject: [PATCH] FIX Setup Issue - Error Creating Base Entry (#286)
---
opendj-server-legacy/src/main/java/org/opends/quicksetup/UserData.java | 29 +++++++----------------------
1 files changed, 7 insertions(+), 22 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/quicksetup/UserData.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/UserData.java
index d558d06..2a5d3ac 100644
--- a/opendj-server-legacy/src/main/java/org/opends/quicksetup/UserData.java
+++ b/opendj-server-legacy/src/main/java/org/opends/quicksetup/UserData.java
@@ -23,6 +23,7 @@
import java.util.Enumeration;
import java.util.HashMap;
import java.util.HashSet;
+import java.util.LinkedHashMap;
import java.util.LinkedList;
import java.util.Map;
import java.util.Set;
@@ -866,42 +867,26 @@
private void createDefaultJavaArguments()
{
- hmJavaArguments = new HashMap<>();
- 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
- // memory.
- long currentMaxMemoryBytes = Runtime.getRuntime().maxMemory();
- if (currentMaxMemoryBytes > maxMemoryBytes)
- {
- maxMemoryMb = -1;
- minMemoryMb = -1;
- }
+ hmJavaArguments = new LinkedHashMap<>();
+
+ JavaArguments defaultPanelJavaArgument = new JavaArguments();
+ hmJavaArguments.put("default", defaultPanelJavaArgument);
+
for (String clientScript : getClientScripts())
{
JavaArguments javaArgument = new JavaArguments();
- javaArgument.setInitialMemory(8);
- javaArgument.setAdditionalArguments(new String[] {"-client"});
hmJavaArguments.put(clientScript, javaArgument);
}
for (String serverScript : getServerScripts())
{
JavaArguments javaArgument = new JavaArguments();
- javaArgument.setInitialMemory(minMemoryMb);
- javaArgument.setMaxMemory(maxMemoryMb);
- javaArgument.setAdditionalArguments(new String[] {"-server"});
hmJavaArguments.put(serverScript, javaArgument);
}
JavaArguments controlPanelJavaArgument = new JavaArguments();
- controlPanelJavaArgument.setInitialMemory(64);
- controlPanelJavaArgument.setMaxMemory(128);
- controlPanelJavaArgument.setAdditionalArguments(new String[] {"-client"});
hmJavaArguments.put("control-panel", controlPanelJavaArgument);
- hmDefaultJavaArguments = new HashMap<>(hmJavaArguments);
+ hmDefaultJavaArguments = new LinkedHashMap<>(hmJavaArguments);
}
private String[] getClientScripts()
--
Gitblit v1.10.0