diff options
author | Mikhail Kalkov | 2014-03-28 08:38:26 +0000 |
---|---|---|
committer | Mikhail Kalkov | 2014-03-28 08:49:21 +0000 |
commit | 6dcd7aba1cb9a9158f1246e98ec2132527160edc (patch) | |
tree | 09f23e97cec02c38e32b27c04e0bb38efc858013 | |
parent | c68ddea8969bd46d6a2306e29f730c15722e084e (diff) | |
download | eclipse.jdt.debug-6dcd7aba1cb9a9158f1246e98ec2132527160edc.tar.gz eclipse.jdt.debug-6dcd7aba1cb9a9158f1246e98ec2132527160edc.tar.xz eclipse.jdt.debug-6dcd7aba1cb9a9158f1246e98ec2132527160edc.zip |
Bug 414285 - On systems with large RAM, evaluateSystemProperties and generateLibraryInfo fail for 64-bit JREs
Change-Id: I8742d94751caad3149f05ed624d7d729bcca13b1
Signed-off-by: Mikhail Kalkov <mikhail.kalkov@purplescout.se>
-rw-r--r-- | org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/StandardVMType.java | 2 | ||||
-rw-r--r-- | org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/AbstractVMInstall.java | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/StandardVMType.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/StandardVMType.java index 1381e13e5..f5f4a6ba7 100644 --- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/StandardVMType.java +++ b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/StandardVMType.java @@ -594,7 +594,7 @@ public class StandardVMType extends AbstractVMInstallType { File file = LaunchingPlugin.getFileInPlugin(new Path("lib/launchingsupport.jar")); //$NON-NLS-1$ if (file != null && file.exists()) { String javaExecutablePath = javaExecutable.getAbsolutePath(); - String[] cmdLine = new String[] {javaExecutablePath, "-classpath", file.getAbsolutePath(), "org.eclipse.jdt.internal.launching.support.LibraryDetector"}; //$NON-NLS-1$ //$NON-NLS-2$ + String[] cmdLine = new String[] {javaExecutablePath, "-Xmx4m", "-classpath", file.getAbsolutePath(), "org.eclipse.jdt.internal.launching.support.LibraryDetector"}; //$NON-NLS-1$ //$NON-NLS-2$ Process p = null; try { String envp[] = null; diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/AbstractVMInstall.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/AbstractVMInstall.java index e9afc3df1..56c5f2c38 100644 --- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/AbstractVMInstall.java +++ b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/AbstractVMInstall.java @@ -362,6 +362,7 @@ public abstract class AbstractVMInstall implements IVMInstall, IVMInstall2, IVMI if (runner == null) { abort(LaunchingMessages.AbstractVMInstall_0, null, IJavaLaunchConfigurationConstants.ERR_INTERNAL_ERROR); } + config.setVMArguments(new String[] { "-Xmx4m" }); config.setProgramArguments(properties); Launch launch = new Launch(null, ILaunchManager.RUN_MODE, null); if (monitor.isCanceled()) { |