diff options
| author | Stephan Herrmann | 2020-02-28 23:53:44 +0000 |
|---|---|---|
| committer | Stephan Herrmann | 2020-03-10 12:39:37 +0000 |
| commit | e58a73a30002eec95ace959394ec18f1f85b30ef (patch) | |
| tree | 1a99bc0f60d4f653598be8a91e78fb9899adc58f | |
| parent | 0868f3b2221bc1d98910c1d867395871c555bc88 (diff) | |
| download | eclipse.jdt.core-e58a73a30002eec95ace959394ec18f1f85b30ef.tar.gz eclipse.jdt.core-e58a73a30002eec95ace959394ec18f1f85b30ef.tar.xz eclipse.jdt.core-e58a73a30002eec95ace959394ec18f1f85b30ef.zip | |
Bug 560634 - Eclipse rebuilds after every restart when "Use '--release'
option" is enabled
Change-Id: I75518c74937bfed1d0810e75bf85e9ee1f5e5c43
| -rw-r--r-- | org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/State.java | 24 |
1 files changed, 8 insertions, 16 deletions
diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/State.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/State.java index 7afd3dc085..b6da02ddfb 100644 --- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/State.java +++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/State.java @@ -579,14 +579,10 @@ void write(DataOutputStream out) throws IOException { out.writeUTF(jrt.zipFilename); writeRestriction(jrt.accessRuleSet, out); out.writeUTF(jrt.externalAnnotationPath != null ? jrt.externalAnnotationPath : ""); //$NON-NLS-1$ - out.writeUTF(""); //$NON-NLS-1$ - } else { - ClasspathJrtWithReleaseOption jrt = (ClasspathJrtWithReleaseOption) c; - out.writeByte(EXTERNAL_JAR); - out.writeUTF(jrt.zipFilename); - writeRestriction(jrt.accessRuleSet, out); - out.writeUTF(jrt.externalAnnotationPath != null ? jrt.externalAnnotationPath : ""); //$NON-NLS-1$ - out.writeUTF(jrt.release); + if (jrt instanceof ClasspathJrtWithReleaseOption) + out.writeUTF(((ClasspathJrtWithReleaseOption) jrt).release); + else + out.writeUTF(""); //$NON-NLS-1$ } char[] patchName = c.patchModuleName == null ? CharOperation.NO_CHAR : c.patchModuleName.toCharArray(); writeName(patchName, out); @@ -698,14 +694,10 @@ void write(DataOutputStream out) throws IOException { out.writeUTF(jrt.zipFilename); writeRestriction(jrt.accessRuleSet, out); out.writeUTF(jrt.externalAnnotationPath != null ? jrt.externalAnnotationPath : ""); //$NON-NLS-1$ - out.writeUTF(""); //$NON-NLS-1$ - } else { - ClasspathJrtWithReleaseOption jrt = (ClasspathJrtWithReleaseOption) c; - out.writeByte(EXTERNAL_JAR); - out.writeUTF(jrt.zipFilename); - writeRestriction(jrt.accessRuleSet, out); - out.writeUTF(jrt.externalAnnotationPath != null ? jrt.externalAnnotationPath : ""); //$NON-NLS-1$ - out.writeUTF(jrt.release); + if (jrt instanceof ClasspathJrtWithReleaseOption) + out.writeUTF(((ClasspathJrtWithReleaseOption) jrt).release); + else + out.writeUTF(""); //$NON-NLS-1$ } } |