diff options
12 files changed, 30 insertions, 18 deletions
diff --git a/build/org.eclipse.cdt.autotools.docs/META-INF/MANIFEST.MF b/build/org.eclipse.cdt.autotools.docs/META-INF/MANIFEST.MF index 4d5357801dd..4f589cfeb30 100644 --- a/build/org.eclipse.cdt.autotools.docs/META-INF/MANIFEST.MF +++ b/build/org.eclipse.cdt.autotools.docs/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %bundleName Bundle-SymbolicName: org.eclipse.cdt.autotools.docs;singleton:=true -Bundle-Version: 2.0.3.qualifier +Bundle-Version: 2.0.4.qualifier Bundle-Vendor: %provider Bundle-Localization: plugin Require-Bundle: org.eclipse.help, diff --git a/build/org.eclipse.cdt.autotools.docs/pom.xml b/build/org.eclipse.cdt.autotools.docs/pom.xml index 3d1edb1fda7..880cb2659dc 100644 --- a/build/org.eclipse.cdt.autotools.docs/pom.xml +++ b/build/org.eclipse.cdt.autotools.docs/pom.xml @@ -11,7 +11,7 @@ <relativePath>../../pom.xml</relativePath> </parent> - <version>2.0.3-SNAPSHOT</version> + <version>2.0.4-SNAPSHOT</version> <artifactId>org.eclipse.cdt.autotools.docs</artifactId> <packaging>eclipse-plugin</packaging> diff --git a/build/org.eclipse.cdt.meson.docs/META-INF/MANIFEST.MF b/build/org.eclipse.cdt.meson.docs/META-INF/MANIFEST.MF index b5a36bce2cf..ea21d358af4 100644 --- a/build/org.eclipse.cdt.meson.docs/META-INF/MANIFEST.MF +++ b/build/org.eclipse.cdt.meson.docs/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %bundleName Bundle-SymbolicName: org.eclipse.cdt.meson.docs;singleton:=true -Bundle-Version: 1.0.1.qualifier +Bundle-Version: 1.0.2.qualifier Bundle-Vendor: %provider Bundle-Localization: plugin Require-Bundle: org.eclipse.help, diff --git a/build/org.eclipse.cdt.meson.docs/pom.xml b/build/org.eclipse.cdt.meson.docs/pom.xml index 026751cb157..678dc2dcd90 100644 --- a/build/org.eclipse.cdt.meson.docs/pom.xml +++ b/build/org.eclipse.cdt.meson.docs/pom.xml @@ -11,7 +11,7 @@ <relativePath>../../pom.xml</relativePath> </parent> - <version>1.0.1-SNAPSHOT</version> + <version>1.0.2-SNAPSHOT</version> <artifactId>org.eclipse.cdt.meson.docs</artifactId> <packaging>eclipse-plugin</packaging> diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/ASTTranslationUnit.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/ASTTranslationUnit.java index 80a20e97e75..1e7b1d279b9 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/ASTTranslationUnit.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/ASTTranslationUnit.java @@ -95,8 +95,18 @@ public abstract class ASTTranslationUnit extends ASTNode implements IASTTranslat private IBuiltinBindingsProvider fBuiltinBindingsProvider; // Caches - private final WeakHashMap<IType, String> fUnnormalizedTypeStringCache = new WeakHashMap<>(); - private final WeakHashMap<IType, String> fNormalizedTypeStringCache = new WeakHashMap<>(); + private final ThreadLocal<WeakHashMap<IType, String>> fUnnormalizedTypeStringCache = new ThreadLocal<WeakHashMap<IType, String>>() { + @Override + protected WeakHashMap<IType, String> initialValue() { + return new WeakHashMap<>(); + } + }; + private final ThreadLocal<WeakHashMap<IType, String>> fNormalizedTypeStringCache = new ThreadLocal<WeakHashMap<IType, String>>() { + @Override + protected WeakHashMap<IType, String> initialValue() { + return new WeakHashMap<>(); + } + }; @Override public final IASTTranslationUnit getTranslationUnit() { @@ -585,6 +595,6 @@ public abstract class ASTTranslationUnit extends ASTNode implements IASTTranslat } public Map<IType, String> getTypeStringCache(boolean normalized) { - return normalized ? fNormalizedTypeStringCache : fUnnormalizedTypeStringCache; + return normalized ? fNormalizedTypeStringCache.get() : fUnnormalizedTypeStringCache.get(); } } diff --git a/debug/org.eclipse.cdt.debug.application.doc/META-INF/MANIFEST.MF b/debug/org.eclipse.cdt.debug.application.doc/META-INF/MANIFEST.MF index 2774e0f5436..b2d7b415bdc 100644 --- a/debug/org.eclipse.cdt.debug.application.doc/META-INF/MANIFEST.MF +++ b/debug/org.eclipse.cdt.debug.application.doc/META-INF/MANIFEST.MF @@ -2,6 +2,6 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %bundleName Bundle-SymbolicName: org.eclipse.cdt.debug.application.doc;singleton:=true -Bundle-Version: 1.1.1.qualifier +Bundle-Version: 1.1.2.qualifier Bundle-Vendor: %provider Bundle-Localization: plugin diff --git a/debug/org.eclipse.cdt.debug.application.doc/pom.xml b/debug/org.eclipse.cdt.debug.application.doc/pom.xml index d5a986cd992..6f4a74037c4 100644 --- a/debug/org.eclipse.cdt.debug.application.doc/pom.xml +++ b/debug/org.eclipse.cdt.debug.application.doc/pom.xml @@ -10,7 +10,7 @@ <relativePath>../../pom.xml</relativePath> </parent> - <version>1.1.1-SNAPSHOT</version> + <version>1.1.2-SNAPSHOT</version> <artifactId>org.eclipse.cdt.debug.application.doc</artifactId> <packaging>eclipse-plugin</packaging> diff --git a/doc/org.eclipse.cdt.doc.isv/META-INF/MANIFEST.MF b/doc/org.eclipse.cdt.doc.isv/META-INF/MANIFEST.MF index 89a264ca2e7..ed432916f67 100644 --- a/doc/org.eclipse.cdt.doc.isv/META-INF/MANIFEST.MF +++ b/doc/org.eclipse.cdt.doc.isv/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.cdt.doc.isv; singleton:=true -Bundle-Version: 5.4.1.qualifier +Bundle-Version: 5.4.2.qualifier Bundle-Localization: plugin Require-Bundle: org.eclipse.help;bundle-version="[3.2.0,4.0.0)" Bundle-ActivationPolicy: lazy diff --git a/doc/org.eclipse.cdt.doc.isv/pom.xml b/doc/org.eclipse.cdt.doc.isv/pom.xml index e8b76cb30ff..201a517e7b0 100644 --- a/doc/org.eclipse.cdt.doc.isv/pom.xml +++ b/doc/org.eclipse.cdt.doc.isv/pom.xml @@ -10,7 +10,7 @@ <relativePath>../../pom.xml</relativePath> </parent> - <version>5.4.1-SNAPSHOT</version> + <version>5.4.2-SNAPSHOT</version> <artifactId>org.eclipse.cdt.doc.isv</artifactId> <packaging>eclipse-plugin</packaging> diff --git a/doc/org.eclipse.cdt.doc.user/META-INF/MANIFEST.MF b/doc/org.eclipse.cdt.doc.user/META-INF/MANIFEST.MF index daf97928ee0..21244509fbb 100644 --- a/doc/org.eclipse.cdt.doc.user/META-INF/MANIFEST.MF +++ b/doc/org.eclipse.cdt.doc.user/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.cdt.doc.user; singleton:=true -Bundle-Version: 5.4.1.qualifier +Bundle-Version: 5.4.2.qualifier Bundle-Vendor: %providerName Bundle-Localization: plugin Bundle-ActivationPolicy: lazy diff --git a/doc/org.eclipse.cdt.doc.user/pom.xml b/doc/org.eclipse.cdt.doc.user/pom.xml index 848e6f74e71..16833d0dfa4 100644 --- a/doc/org.eclipse.cdt.doc.user/pom.xml +++ b/doc/org.eclipse.cdt.doc.user/pom.xml @@ -10,7 +10,7 @@ <relativePath>../../pom.xml</relativePath> </parent> - <version>5.4.1-SNAPSHOT</version> + <version>5.4.2-SNAPSHOT</version> <artifactId>org.eclipse.cdt.doc.user</artifactId> <packaging>eclipse-plugin</packaging> @@ -770,20 +770,22 @@ </goals> <phase>verify</phase> <configuration> - <baselineMode>warn</baselineMode> + <baselineMode>fail</baselineMode> <baselineReplace>all</baselineReplace> <baselineRepositories> <repository> <url>${comparator.repo}</url> </repository> </baselineRepositories> - <ignoredPatterns> - <pattern>META-INF/ECLIPSE_.RSA</pattern> - <pattern>META-INF/ECLIPSE_.SF</pattern> - </ignoredPatterns> </configuration> </execution> </executions> + <configuration> + <ignoredPatterns> + <pattern>META-INF/ECLIPSE_.RSA</pattern> + <pattern>META-INF/ECLIPSE_.SF</pattern> + </ignoredPatterns> + </configuration> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> |