Attachment 113829 Details for Bug 165771 – proposed patch

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] proposed patch

patchForBug165771.txt (text/plain), 1.53 KB, created by Eiji Morito

on 2008-09-29 21:59:04 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Eiji Morito

Created: 2008-09-29 21:59:04 EDT

Size: 1.53 KB

patch

obsolete

>Index: launching/org/eclipse/jdt/launching/JavaRuntime.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/JavaRuntime.java,v
>retrieving revision 1.207
>diff -u -r1.207 JavaRuntime.java
>--- launching/org/eclipse/jdt/launching/JavaRuntime.java	24 Sep 2008 20:17:38 -0000	1.207
>+++ launching/org/eclipse/jdt/launching/JavaRuntime.java	30 Sep 2008 01:49:26 -0000
>@@ -2567,6 +2567,10 @@
> 							}
> 						}
> 						
>+						// bug 165771
>+						// 4. load contributed VM installs
>+						addVMExtensions(vmDefs);
>+						
> 						// 3. if there are none, detect the eclipse runtime
> 						if (vmDefs.getValidVMList().isEmpty()) {
> 							// calling out to detectEclipseRuntime() could allow clients to change
>@@ -2589,8 +2593,9 @@
> 								updateCompliance = fgDefaultVMId != null;
> 							}
> 						}
>+						// bug 165771
> 						// 4. load contributed VM installs
>-						addVMExtensions(vmDefs);
>+						//addVMExtensions(vmDefs);
> 						// 5. verify default VM is valid
> 						String defId = vmDefs.getDefaultVMInstallCompositeID();
> 						boolean validDef = false;
>@@ -2611,6 +2616,10 @@
> 							if (!list.isEmpty()) {
> 								IVMInstall vm = (IVMInstall) list.get(0);
> 								vmDefs.setDefaultVMInstallCompositeID(getCompositeIdFromVM(vm));
>+								// bug 165771
>+								if (defId == null) {
>+									updateCompliance = true;
>+								}
> 							}
> 						}
> 						fgDefaultVMId = vmDefs.getDefaultVMInstallCompositeID();

Actions: View | Diff

Attachments on bug 165771: 113828 | 113829