double-checked locking is not thread-safe in Java

found by PMD

Change-Id: Ibd4a9139c626932bec56c0b1dd32b4d59c8440b1

2 files changed, 5 insertions, 12 deletions

diff --git a/scripting/java/org/openoffice/netbeans/modules/office/utils/ManifestParser.java b/scripting/java/org/openoffice/netbeans/modules/office/utils/ManifestParser.java
index 892313332a14..1859ec60865e 100644
--- a/scripting/java/org/openoffice/netbeans/modules/office/utils/ManifestParser.java
+++ b/scripting/java/org/openoffice/netbeans/modules/office/utils/ManifestParser.java
@@ -41,12 +41,9 @@ public class ManifestParser implements XMLParser {
     private ManifestParser() {
     }
 
-    public static ManifestParser getManifestParser() {
+    public static synchronized ManifestParser getManifestParser() {
         if (parser == null) {
-            synchronized(ManifestParser.class) {
-                if (parser == null)
-                    parser = new ManifestParser();
-            }
+            parser = new ManifestParser();
         }
         return parser;
     }
diff --git a/scripting/java/org/openoffice/netbeans/modules/office/utils/ZipMounter.java b/scripting/java/org/openoffice/netbeans/modules/office/utils/ZipMounter.java
index 8a1bc1849ac4..7150ef81e541 100644
--- a/scripting/java/org/openoffice/netbeans/modules/office/utils/ZipMounter.java
+++ b/scripting/java/org/openoffice/netbeans/modules/office/utils/ZipMounter.java
@@ -34,13 +34,9 @@ public class ZipMounter
     private ZipMounter() {
     }
 
-    public static ZipMounter getZipMounter() {
-        if (mounter == null) {
-            synchronized(ZipMounter.class) {
-                if (mounter == null)
-                    mounter = new ZipMounter();
-            }
-        }
+    public static synchronized ZipMounter getZipMounter() {
+        if (mounter == null)
+            mounter = new ZipMounter();
         return mounter;
     }