Attachment 217166 Details for Bug 217994 – updated patch

[patch] updated patch

eclipse.jdt.debug.args.patch (text/plain), 1.39 KB, created by Michael Rennie

on 2012-06-11 11:48:37 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Michael Rennie

Created: 2012-06-11 11:48:37 EDT

Size: 1.39 KB

patch

obsolete

>diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/AbstractVMRunner.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/AbstractVMRunner.java
>index 355a990..8f6a1aa 100644
>--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/AbstractVMRunner.java
>+++ b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/AbstractVMRunner.java
>@@ -7,6 +7,7 @@
>  *
>  * Contributors:
>  *     IBM Corporation - initial API and implementation
>+ *     Pascal Gruen (pascal.gruen@googlemail.com) - Bug 217994 Run/Debug honors JRE VM args before Launcher VM args
>  *******************************************************************************/
> package org.eclipse.jdt.launching;
> 
>@@ -156,9 +157,12 @@
> 				LaunchingPlugin.log(e.getStatus());
> 			}
> 		}
>+		//https://bugs.eclipse.org/bugs/show_bug.cgi?id=217994
>+		// merge default VM + launcher VM arguments. Make sure to pass launcher arguments in last so that
>+		// they can take precedence over the default VM args!
> 		String[] allVMArgs = new String[launchVMArgs.length + vmVMArgs.length];
>-		System.arraycopy(launchVMArgs, 0, allVMArgs, 0, launchVMArgs.length);
>-		System.arraycopy(vmVMArgs, 0, allVMArgs, launchVMArgs.length, vmVMArgs.length);
>+		System.arraycopy(vmVMArgs, 0, allVMArgs, 0, vmVMArgs.length);
>+		System.arraycopy(launchVMArgs, 0, allVMArgs, vmVMArgs.length, launchVMArgs.length);
> 		return allVMArgs;
> 	}
> }

Flags:

Michael_Rennie: iplog+

Actions: View | Diff

Attachments on bug 217994: 217158 | 217166