|
Lines 7-12
Link Here
|
| 7 |
* |
7 |
* |
| 8 |
* Contributors: |
8 |
* Contributors: |
| 9 |
* IBM Corporation - initial API and implementation |
9 |
* IBM Corporation - initial API and implementation |
|
|
10 |
* Pascal Gruen (pascal.gruen@googlemail.com) - Bug 217994 Run/Debug honors JRE VM args before Launcher VM args |
| 10 |
*******************************************************************************/ |
11 |
*******************************************************************************/ |
| 11 |
package org.eclipse.jdt.launching; |
12 |
package org.eclipse.jdt.launching; |
| 12 |
|
13 |
|
|
Lines 156-164
Link Here
|
| 156 |
LaunchingPlugin.log(e.getStatus()); |
157 |
LaunchingPlugin.log(e.getStatus()); |
| 157 |
} |
158 |
} |
| 158 |
} |
159 |
} |
|
|
160 |
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=217994 |
| 161 |
// merge default VM + launcher VM arguments. Make sure to pass launcher arguments in last so that |
| 162 |
// they can take precedence over the default VM args! |
| 159 |
String[] allVMArgs = new String[launchVMArgs.length + vmVMArgs.length]; |
163 |
String[] allVMArgs = new String[launchVMArgs.length + vmVMArgs.length]; |
| 160 |
System.arraycopy(launchVMArgs, 0, allVMArgs, 0, launchVMArgs.length); |
164 |
System.arraycopy(vmVMArgs, 0, allVMArgs, 0, vmVMArgs.length); |
| 161 |
System.arraycopy(vmVMArgs, 0, allVMArgs, launchVMArgs.length, vmVMArgs.length); |
165 |
System.arraycopy(launchVMArgs, 0, allVMArgs, vmVMArgs.length, launchVMArgs.length); |
| 162 |
return allVMArgs; |
166 |
return allVMArgs; |
| 163 |
} |
167 |
} |
| 164 |
} |
168 |
} |
