Merge pull request #4216 from pdudits/payara-4131

PAYARA-4131: Fix race conditions in resource class generation
payara · Sep 12, 2019 · 473b0bf · 473b0bf
2 parents 73b8139 + a319736
commit 473b0bf
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 12 deletions.
diff --git a/...ervice/src/main/java/org/glassfish/admin/rest/adapter/RestManagementResourceProvider.java b/...ervice/src/main/java/org/glassfish/admin/rest/adapter/RestManagementResourceProvider.java
@@ -192,12 +192,14 @@ private void registerExtendedWadlConfig(Set<Class<?>> classes,
 
     private void generateASM(ServiceLocator habitat) {
         try {
-            Domain entity = habitat.getService(Domain.class);
-            Dom dom = Dom.unwrap(entity);
+            synchronized (RestManagementResourceProvider.class) {
+                Domain entity = habitat.getService(Domain.class);
+                Dom dom = Dom.unwrap(entity);
 
-            ResourcesGenerator resourcesGenerator = new ASMResourcesGenerator(habitat);
-            resourcesGenerator.generateSingle(dom.document.getRoot().model, dom.document);
-            resourcesGenerator.endGeneration();
+                ResourcesGenerator resourcesGenerator = new ASMResourcesGenerator(habitat);
+                resourcesGenerator.generateSingle(dom.document.getRoot().model, dom.document);
+                resourcesGenerator.endGeneration();
+            }
         } catch (Exception ex) {
             RestLogging.restLogger.log(Level.SEVERE, null, ex);
         }

diff --git a/...rest-service/src/main/java/org/glassfish/admin/rest/generator/ResourcesGeneratorBase.java b/...rest-service/src/main/java/org/glassfish/admin/rest/generator/ResourcesGeneratorBase.java
@@ -62,7 +62,7 @@
  */
 public abstract class ResourcesGeneratorBase implements ResourcesGenerator {
 
-    private static Set<String> alreadyGenerated = new HashSet<String>();
+    private static Set<String> alreadyGenerated = Collections.synchronizedSet(new HashSet<String>());
     ServiceLocator habitat;
 
     public ResourcesGeneratorBase(ServiceLocator habitat) {
@@ -144,6 +144,7 @@ public void generateSingle(ConfigModel model, DomDocument domDocument) {
 
             classWriter.done();
         }
+        alreadyGenerated.add(className);
     }
 
     public void generateList(ConfigModel model, DomDocument domDocument) {
@@ -376,12 +377,7 @@ private void generateCommandResourceClass(String parentBeanName, CommandResource
      * @return true if the given className is already generated. false otherwise.
      */
     protected boolean alreadyGenerated(String className) {
-        boolean retVal = true;
-        if (!alreadyGenerated.contains(className)) {
-            alreadyGenerated.add(className);
-            retVal = false;
-        }
-        return retVal;
+        return alreadyGenerated.contains(className);
     }
 
     /**