Bug 228236 - ConcurrentModificationException when opening source file - follow up

1 files changed, 11 insertions, 13 deletions

diff --git a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig2/ScannerConfigProfileManager.java b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig2/ScannerConfigProfileManager.java
index ccac962bc48..9997001b06c 100644
--- a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig2/ScannerConfigProfileManager.java
+++ b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig2/ScannerConfigProfileManager.java
@@ -150,21 +150,19 @@ public final class ScannerConfigProfileManager {
 	}
 
 	/**
-	 * @return
+	 * @return a list of available scanner config profile id's.
 	 */
 	public List<String> getProfileIds() {
-		if (profileIds == null) {
-			synchronized (fLock) {
-				if (profileIds == null) {
-					profileIds = new ArrayList<String>();
-					IExtensionPoint extension = Platform.getExtensionRegistry().
-							getExtensionPoint(MakeCorePlugin.PLUGIN_ID, ScannerConfigProfileManager.SI_PROFILE_SIMPLE_ID);
-					if (extension != null) {
-						IExtension[] extensions = extension.getExtensions();
-						for (int i = 0; i < extensions.length; ++i) {
-							String rProfileId = extensions[i].getUniqueIdentifier();
-							profileIds.add(rProfileId);
-						}
+		synchronized (fLock) {
+			if (profileIds == null) {
+				profileIds = new ArrayList<String>();
+				IExtensionPoint extension = Platform.getExtensionRegistry().
+						getExtensionPoint(MakeCorePlugin.PLUGIN_ID, ScannerConfigProfileManager.SI_PROFILE_SIMPLE_ID);
+				if (extension != null) {
+					IExtension[] extensions = extension.getExtensions();
+					for (int i = 0; i < extensions.length; ++i) {
+						String rProfileId = extensions[i].getUniqueIdentifier();
+						profileIds.add(rProfileId);
 					}
 				}
 			}