fix wrong double-checked locking

see https://rules.sonarsource.com/java/RSPEC-2168
eclipse-platform · Jun 9, 2023 · 7280baa · 7280baa
1 parent f3197c1
commit 7280baa
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 10 deletions.
diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/base/BaseHelpSystem.java b/org.eclipse.help.base/src/org/eclipse/help/internal/base/BaseHelpSystem.java
@@ -74,11 +74,9 @@ public static BaseHelpSystem getInstance() {
 	 * help system's search capability.
 	 */
 	public static SearchManager getSearchManager() {
-		if (getInstance().searchManager == null) {
-			synchronized (BaseHelpSystem.class) {
-				if (getInstance().searchManager == null) {
-					getInstance().searchManager = new SearchManager();
-				}
+		synchronized (BaseHelpSystem.class) {
+			if (getInstance().searchManager == null) {
+				getInstance().searchManager = new SearchManager();
 			}
 		}
 		return getInstance().searchManager;

diff --git a/org.eclipse.help/src/org/eclipse/help/internal/HelpPlugin.java b/org.eclipse.help/src/org/eclipse/help/internal/HelpPlugin.java
@@ -71,11 +71,9 @@ public static HelpPlugin getDefault() {
 	 * @return instance of TocManager
 	 */
 	public static TocManager getTocManager() {
-		if (getDefault().tocManager == null) {
-			synchronized (tocManagerCreateLock) {
-				if (getDefault().tocManager == null) {
-					getDefault().tocManager = new TocManager();
-				}
+		synchronized (tocManagerCreateLock) {
+			if (getDefault().tocManager == null) {
+				getDefault().tocManager = new TocManager();
 			}
 		}
 		return getDefault().tocManager;