Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrey Loskutov2020-05-14 22:08:42 +0000
committerAndrey Loskutov2020-05-15 05:06:39 +0000
commit8cf64302cf48ebc8b9e15908bc66f2358cbcccb9 (patch)
tree6326d015f1f244620d8f64326a1ccfe2aef35e3b
parentac6bed561e9af89b13ba8e95bbecba7412d9702c (diff)
downloadeclipse.jdt.core-8cf64302cf48ebc8b9e15908bc66f2358cbcccb9.tar.gz
eclipse.jdt.core-8cf64302cf48ebc8b9e15908bc66f2358cbcccb9.tar.xz
eclipse.jdt.core-8cf64302cf48ebc8b9e15908bc66f2358cbcccb9.zip
Bug 562727 - special handling of broken module data in Java 11 for
compilation with --release 10 See bug 549647 for the explanation. Change-Id: If08c00abbc8061f68fac1c7fffe3f0b28a58ea56 Signed-off-by: Andrey Loskutov <loskutov@gmx.de>
-rw-r--r--org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/util/CtSym.java5
1 files changed, 5 insertions, 0 deletions
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/util/CtSym.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/util/CtSym.java
index 1f5337e5e0..8a04b703ef 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/util/CtSym.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/util/CtSym.java
@@ -263,6 +263,11 @@ public class CtSym {
if(moduleName != null) {
// Without this, org.eclipse.jdt.core.tests.model.ModuleBuilderTests.testConvertToModule() fails on 12+ JRE
path = releasePaths.get(moduleName + sep + qualifiedSignatureFileName);
+
+ // Special handling of broken module shema in java 11 for compilation with --release 10
+ if(path == null && !this.isJRE12Plus() && "A".equals(releaseInHex)){ //$NON-NLS-1$
+ path = releasePaths.get(qualifiedSignatureFileName);
+ }
} else {
path = releasePaths.get(qualifiedSignatureFileName);
}

Back to the top