Make the Mojo threadsafe

Fixes #161 Signed-off-by: Gary O'Neall <[email protected]>
spdx · Mar 11, 2024 · 7b8db2e · 7b8db2e
1 parent b725783
commit 7b8db2e
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 6 deletions.
diff --git a/src/main/java/org/spdx/maven/CreateSpdxMojo.java b/src/main/java/org/spdx/maven/CreateSpdxMojo.java
@@ -28,7 +28,6 @@
 import org.apache.maven.plugins.annotations.LifecyclePhase;
 import org.apache.maven.plugins.annotations.Mojo;
 import org.apache.maven.plugins.annotations.Parameter;
-import org.apache.maven.plugins.annotations.ResolutionScope;
 import org.apache.maven.project.DefaultProjectBuildingRequest;
 import org.apache.maven.project.MavenProject;
 import org.apache.maven.project.MavenProjectHelper;
@@ -98,7 +97,8 @@
  */
 @Mojo( name = "createSPDX",
        defaultPhase = LifecyclePhase.VERIFY,
-        requiresOnline = true )
+        requiresOnline = true,
+       threadSafe = true )
 public class CreateSpdxMojo extends AbstractMojo
 {
     public static final String INCLUDE_ALL = "**/*";

diff --git a/src/main/java/org/spdx/maven/utils/MavenToSpdxLicenseMapper.java b/src/main/java/org/spdx/maven/utils/MavenToSpdxLicenseMapper.java
@@ -61,7 +61,8 @@ public class MavenToSpdxLicenseMapper
     private static final String LISTED_LICENSE_JSON_URL = SPDX_LICENSE_URL_PREFIX + "licenses.json";
     private static final String LISTED_LICENSE_JSON_PATH = "resources/licenses.json";
 
-    static MavenToSpdxLicenseMapper instance;
+    static volatile MavenToSpdxLicenseMapper instance;
+    private static Object instanceMutex = new Object();
     private Map<String, String> urlStringToSpdxLicenseId;
 
     private MavenToSpdxLicenseMapper() throws LicenseMapperException
@@ -101,11 +102,19 @@ private MavenToSpdxLicenseMapper() throws LicenseMapperException
 
     public static MavenToSpdxLicenseMapper getInstance() throws LicenseMapperException
     {
-        if ( instance == null )
+        MavenToSpdxLicenseMapper result = instance;
+        if ( result == null )
         {
-            instance = new MavenToSpdxLicenseMapper();
+            synchronized ( instanceMutex )
+            {
+                result = instance;
+                if ( result == null )
+                {
+                    instance = result = new MavenToSpdxLicenseMapper();
+                }
+            }
         }
-        return instance;
+        return result;
     }
 
     /**