From 1661b519754cb11b019db1731b55de015593d62a Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Tue, 08 Mar 2016 22:01:31 +0000
Subject: [PATCH] OPENDJ-2669 Fix incorrect messages for memory settings error
---
opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/ui/JavaArgumentsDialog.java | 2 +-
opendj-server-legacy/src/main/java/org/opends/quicksetup/JavaArguments.java | 4 ++--
opendj-server-legacy/src/messages/org/opends/messages/quickSetup.properties | 8 ++++----
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/quicksetup/JavaArguments.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/JavaArguments.java
index 0cbb17f..b8813a3 100644
--- a/opendj-server-legacy/src/main/java/org/opends/quicksetup/JavaArguments.java
+++ b/opendj-server-legacy/src/main/java/org/opends/quicksetup/JavaArguments.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2010 Sun Microsystems, Inc.
- * Portions Copyright 2013-2015 ForgeRock AS.
+ * Portions Copyright 2013-2016 ForgeRock AS.
*/
package org.opends.quicksetup;
@@ -280,6 +280,6 @@
*/
public static String getMaxMemoryGenericArgument()
{
- return "-Xms<"+INFO_MEMORY_PLACEHOLDER.get()+">";
+ return "-Xmx<"+INFO_MEMORY_PLACEHOLDER.get()+">";
}
}
diff --git a/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/ui/JavaArgumentsDialog.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/ui/JavaArgumentsDialog.java
index a2b7b6c..06aa9f1 100644
--- a/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/ui/JavaArgumentsDialog.java
+++ b/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/ui/JavaArgumentsDialog.java
@@ -787,7 +787,7 @@
{
LocalizableMessage msg = getMemoryErrorMessage(
ERR_MAX_MEMORY_VALUE_EXTENDED.get(
- JavaArguments.getInitialMemoryGenericArgument()), maxMemory);
+ JavaArguments.getMaxMemoryGenericArgument()), maxMemory);
checkOptions(JavaArguments.getMaxMemoryArgument(maxMemory),
errorMsgs,
lMaxMemory,
diff --git a/opendj-server-legacy/src/messages/org/opends/messages/quickSetup.properties b/opendj-server-legacy/src/messages/org/opends/messages/quickSetup.properties
index c0873c5..7288f65 100644
--- a/opendj-server-legacy/src/messages/org/opends/messages/quickSetup.properties
+++ b/opendj-server-legacy/src/messages/org/opends/messages/quickSetup.properties
@@ -853,15 +853,15 @@
integer.
ERR_MAX_MEMORY_VALUE=The maximum memory value must be a positive integer.
ERR_MEMORY_VALUE_EXTENDED=Could not use the provided memory values. \
- Check that the running Java virtual machine supports to specify the %s and \
+ Check that the running Java virtual machine supports the %s and \
%s arguments and that there is enough memory in the machine to use the \
provided values.
ERR_INITIAL_MEMORY_VALUE_EXTENDED=Could not use the provided initial \
- memory value. Check that the running Java virtual machine supports to \
- specify the %s argument and that there is enough memory in the machine to use \
+ memory value. Check that the running Java virtual machine supports \
+ the %s argument and that there is enough memory in the machine to use \
the provided value.
ERR_MAX_MEMORY_VALUE_EXTENDED=Could not use the provided maximum memory \
- value. Check that the running Java virtual machine supports to specify the \
+ value. Check that the running Java virtual machine supports the \
%s argument and that there is enough memory in the machine to use the \
provided value.
ERR_MEMORY_32_BIT_LIMIT=Note that 32-bit Java virtual machines do not \
--
Gitblit v1.10.0