diff options
| author | Till Brychcy | 2017-09-04 19:38:49 +0000 |
|---|---|---|
| committer | Till Brychcy | 2017-09-04 19:38:49 +0000 |
| commit | 303ab53c0c4e979c5c5a8b414f451afe90979685 (patch) | |
| tree | ff9bf9af1a4f90126eb41502f96fbac31c079bc4 | |
| parent | 7c29ae37cc3a2e5f555afbdb029c6b2b8bd21cc1 (diff) | |
| download | eclipse.jdt.debug-303ab53c0c4e979c5c5a8b414f451afe90979685.tar.gz eclipse.jdt.debug-303ab53c0c4e979c5c5a8b414f451afe90979685.tar.xz eclipse.jdt.debug-303ab53c0c4e979c5c5a8b414f451afe90979685.zip | |
Java 8
Change-Id: I4b34f60990d67061f0c567a7bc40689de7ebf2c6
| -rw-r--r-- | org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/StandardClasspathProvider.java | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/StandardClasspathProvider.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/StandardClasspathProvider.java index 66a2e5c54..396ee7fb2 100644 --- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/StandardClasspathProvider.java +++ b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/StandardClasspathProvider.java @@ -50,13 +50,12 @@ public class StandardClasspathProvider implements IRuntimeClasspathProvider { } IRuntimeClasspathEntry[] entries = null; if (isModular) { - entries = JavaRuntime.computeUnresolvedRuntimeDependencies(proj); - } - if (entries == null) { + entries = JavaRuntime.computeUnresolvedRuntimeDependencies(proj); + } else { entries = JavaRuntime.computeUnresolvedRuntimeClasspath(proj); } // replace project JRE with config's JRE - IRuntimeClasspathEntry projEntry = JavaRuntime.computeJREEntry(proj); + IRuntimeClasspathEntry projEntry = isModular ? JavaRuntime.computeModularJREEntry(proj) : JavaRuntime.computeJREEntry(proj); if (jreEntry != null && projEntry != null) { if (!jreEntry.equals(projEntry)) { for (int i = 0; i < entries.length; i++) { |