- Bug 414285: On systems with large RAM...add NON-NLS comments + update
headers
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 f5f4a6b..31575c3 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
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2013 IBM Corporation and others.
+ * Copyright (c) 2000, 2014 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -9,6 +9,7 @@
* IBM Corporation - initial API and implementation
* Michael Allman - Bug 211648, Bug 156343 - Standard VM not supported on MacOS
* Thomas Schindl - Bug 399798, StandardVMType should allow to contribute default source and Javadoc locations for ext libraries
+ * Mikhail Kalkov - Bug 414285, On systems with large RAM, evaluateSystemProperties and generateLibraryInfo fail for 64-bit JREs
*******************************************************************************/
package org.eclipse.jdt.internal.launching;
@@ -325,8 +326,9 @@
}
// if we didn't find any of the normal source files, look for J9 source
IPath result = checkForJ9LibrarySource(libLocation);
- if (result != null)
+ if (result != null) {
return result;
+ }
// check for <lib>-src.jar pattern
IPath libName = new Path(libLocation.getName());
String extension = libName.getFileExtension();
@@ -594,7 +596,8 @@
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, "-Xmx4m", "-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$ //$NON-NLS-3$
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 56c5f2c..ff77284 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
@@ -7,6 +7,7 @@
*
* Contributors:
* IBM Corporation - initial API and implementation
+ * Mikhail Kalkov - Bug 414285, On systems with large RAM, evaluateSystemProperties and generateLibraryInfo fail for 64-bit JREs
*******************************************************************************/
package org.eclipse.jdt.launching;
@@ -362,7 +363,7 @@
if (runner == null) {
abort(LaunchingMessages.AbstractVMInstall_0, null, IJavaLaunchConfigurationConstants.ERR_INTERNAL_ERROR);
}
- config.setVMArguments(new String[] { "-Xmx4m" });
+ config.setVMArguments(new String[] { "-Xmx4m" }); //$NON-NLS-1$
config.setProgramArguments(properties);
Launch launch = new Launch(null, ILaunchManager.RUN_MODE, null);
if (monitor.isCanceled()) {
