From 55569e158ce4a1026f3d2405945154d349dc724c Mon Sep 17 00:00:00 2001 From: Jeff Johnston Date: Tue, 11 Sep 2018 23:44:25 -0400 Subject: [PATCH] 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 --- .../docker/launcher/ui/launchbar/ContainerGCCToolChain.java | 6 ++++-- 1 file 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 5104f9b9a74..1345bbcee7c 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 commandStrings, + synchronized public IExtendedScannerInfo getScannerInfo( + IBuildConfiguration buildConfig, List 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);