Update to fix for 10.6 bvrokers

SolaceDev · Nov 24, 2023 · b9b5090 · b9b5090
1 parent 9ef9298
commit b9b5090
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/src/main/java/com/solace/tools/solconfig/model/JsonSpec.java b/src/main/java/com/solace/tools/solconfig/model/JsonSpec.java
@@ -130,7 +130,9 @@ protected Map<String, List<String>> findAttributes(String collectionPath){
                 result.put(k, mPatch.get(k));
             }
         });
-        sortOutSpecialAttributes(collectionPath, result);
+        if(!result.isEmpty()){
+            sortOutSpecialAttributes(collectionPath, result);
+        }
         result.put(AttributeType.ALL.toString(), getAttributeNames(collectionPath));
         return result;
     }

diff --git a/src/main/java/com/solace/tools/solconfig/model/SempSpec.java b/src/main/java/com/solace/tools/solconfig/model/SempSpec.java
@@ -78,7 +78,9 @@ public static void setupByString(String jsonString) {
     private static void hardcodeSetup() {
         HARD_CODE_REQUIRES_DISABLE.forEach((specPath, list) -> {
             var Requires_Disable = sempSpecMap.get(specPath).attributes.get(AttributeType.REQUIRES_DISABLE.toString());
-            Requires_Disable.addAll(list);
+            if(Requires_Disable != null) {
+                Requires_Disable.addAll(list);
+            }
         });
     }