From 2e08d2c0e9bede644be993ddaa28157c9f156c10 Mon Sep 17 00:00:00 2001
From: Violette Roche-Montane <violette.roche-montane@forgerock.com>
Date: Tue, 07 May 2013 13:50:59 +0000
Subject: [PATCH] svn merge https://svn.forgerock.org/opendj/trunk/opends@8851 https://svn.forgerock.org/opendj/branches/native-packaging@8851 .
---
opends/src/quicksetup/org/opends/quicksetup/installer/ui/JavaArgumentsDialog.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/opends/src/quicksetup/org/opends/quicksetup/installer/ui/JavaArgumentsDialog.java b/opends/src/quicksetup/org/opends/quicksetup/installer/ui/JavaArgumentsDialog.java
index 62371c0..e984f06 100644
--- a/opends/src/quicksetup/org/opends/quicksetup/installer/ui/JavaArgumentsDialog.java
+++ b/opends/src/quicksetup/org/opends/quicksetup/installer/ui/JavaArgumentsDialog.java
@@ -23,7 +23,7 @@
*
*
* Copyright 2010 Sun Microsystems, Inc.
- * Portions Copyright 2011 ForgeRock AS
+ * Portions Copyright 2011-2013 ForgeRock AS
*/
package org.opends.quicksetup.installer.ui;
@@ -94,8 +94,6 @@
private boolean isCheckingVisible;
- private final int MAX_VALUE_32_BIT = 2048;
-
private static boolean userAgreedWithWebStart;
/**
@@ -779,7 +777,8 @@
private Message getMemoryErrorMessage(Message msg, int memValue)
{
- if (memValue < MAX_VALUE_32_BIT)
+ // 2048 MB is acceptable max heap size on 32Bit OS
+ if (memValue < 2048)
{
return msg;
}
@@ -884,7 +883,8 @@
}
if (sb.length() > 0)
{
- checkOptions(sb.toString(), errorMsgs, ls.toArray(new JLabel[]{}),
+ checkOptions(sb.toString(), errorMsgs,
+ ls.toArray(new JLabel[ls.size()]),
ERR_GENERIC_JAVA_ARGUMENT.get(sb.toString()));
}
}
--
Gitblit v1.10.0