summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeff Johnston2018-09-11 23:44:25 -0400
committerJeff Johnston2018-09-12 16:10:18 -0400
commit74eb81b0bb4ea86202047a407d7b6c7080426a82 (patch)
tree74f8544bdccfc1c5c5b798c8cb808022a1e3ad32
parent109cd0c6aac9a22e2e4e4590146bb47ebe115135 (diff)
downloadorg.eclipse.cdt-74eb81b0bb4ea86202047a407d7b6c7080426a82.tar.gz
org.eclipse.cdt-74eb81b0bb4ea86202047a407d7b6c7080426a82.tar.xz
org.eclipse.cdt-74eb81b0bb4ea86202047a407d7b6c7080426a82.zip
Bug 538958 - Meson project built in Container not indexing properly
- add synchronized keyword to the various scanner info collecting methods in ContainerGCCToolChain Change-Id: I476e0c191379621d5ca8ef266c8590a0954ab4a5 (cherry picked from commit 55569e158ce4a1026f3d2405945154d349dc724c)
-rw-r--r--launch/org.eclipse.cdt.docker.launcher/src/org/eclipse/cdt/internal/docker/launcher/ui/launchbar/ContainerGCCToolChain.java6
1 files changed, 4 insertions, 2 deletions
diff --git a/launch/org.eclipse.cdt.docker.launcher/src/org/eclipse/cdt/internal/docker/launcher/ui/launchbar/ContainerGCCToolChain.java b/launch/org.eclipse.cdt.docker.launcher/src/org/eclipse/cdt/internal/docker/launcher/ui/launchbar/ContainerGCCToolChain.java
index 5104f9b9a7..1345bbcee7 100644
--- a/launch/org.eclipse.cdt.docker.launcher/src/org/eclipse/cdt/internal/docker/launcher/ui/launchbar/ContainerGCCToolChain.java
+++ b/launch/org.eclipse.cdt.docker.launcher/src/org/eclipse/cdt/internal/docker/launcher/ui/launchbar/ContainerGCCToolChain.java
@@ -182,7 +182,8 @@ public class ContainerGCCToolChain extends PlatformObject
}
@Override
- public IExtendedScannerInfo getScannerInfo(IBuildConfiguration buildConfig, List<String> commandStrings,
+ synchronized public IExtendedScannerInfo getScannerInfo(
+ IBuildConfiguration buildConfig, List<String> commandStrings,
IExtendedScannerInfo baseScannerInfo, IResource resource, URI buildDirectoryURI) {
try {
Path buildDirectory = Paths.get(buildDirectoryURI);
@@ -301,7 +302,8 @@ public class ContainerGCCToolChain extends PlatformObject
}
@Override
- public IExtendedScannerInfo getDefaultScannerInfo(IBuildConfiguration buildConfig,
+ synchronized public IExtendedScannerInfo getDefaultScannerInfo(
+ IBuildConfiguration buildConfig,
IExtendedScannerInfo baseScannerInfo, ILanguage language, URI buildDirectoryURI) {
try {
String[] commands = getCompileCommands(language);