Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.
View | Details | Raw Unified | Return to bug 165771
Collapse All | Expand All

(-)launching/org/eclipse/jdt/launching/JavaRuntime.java (-1 / +10 lines)
Lines 2567-2572 Link Here
2567
							}
2567
							}
2568
						}
2568
						}
2569
						
2569
						
2570
						// bug 165771
2571
						// 4. load contributed VM installs
2572
						addVMExtensions(vmDefs);
2573
						
2570
						// 3. if there are none, detect the eclipse runtime
2574
						// 3. if there are none, detect the eclipse runtime
2571
						if (vmDefs.getValidVMList().isEmpty()) {
2575
						if (vmDefs.getValidVMList().isEmpty()) {
2572
							// calling out to detectEclipseRuntime() could allow clients to change
2576
							// calling out to detectEclipseRuntime() could allow clients to change
Lines 2589-2596 Link Here
2589
								updateCompliance = fgDefaultVMId != null;
2593
								updateCompliance = fgDefaultVMId != null;
2590
							}
2594
							}
2591
						}
2595
						}
2596
						// bug 165771
2592
						// 4. load contributed VM installs
2597
						// 4. load contributed VM installs
2593
						addVMExtensions(vmDefs);
2598
						//addVMExtensions(vmDefs);
2594
						// 5. verify default VM is valid
2599
						// 5. verify default VM is valid
2595
						String defId = vmDefs.getDefaultVMInstallCompositeID();
2600
						String defId = vmDefs.getDefaultVMInstallCompositeID();
2596
						boolean validDef = false;
2601
						boolean validDef = false;
Lines 2611-2616 Link Here
2611
							if (!list.isEmpty()) {
2616
							if (!list.isEmpty()) {
2612
								IVMInstall vm = (IVMInstall) list.get(0);
2617
								IVMInstall vm = (IVMInstall) list.get(0);
2613
								vmDefs.setDefaultVMInstallCompositeID(getCompositeIdFromVM(vm));
2618
								vmDefs.setDefaultVMInstallCompositeID(getCompositeIdFromVM(vm));
2619
								// bug 165771
2620
								if (defId == null) {
2621
									updateCompliance = true;
2622
								}
2614
							}
2623
							}
2615
						}
2624
						}
2616
						fgDefaultVMId = vmDefs.getDefaultVMInstallCompositeID();
2625
						fgDefaultVMId = vmDefs.getDefaultVMInstallCompositeID();

Return to bug 165771