Merge pull request #573 from HubSpot/null-disabled

Check that disabled library map isn't null
HubSpot · Dec 22, 2020 · 27f9eaf · 27f9eaf
2 parents 93257ff + c4e3420
commit 27f9eaf
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/src/main/java/com/hubspot/jinjava/lib/tag/eager/EagerTagDecorator.java b/src/main/java/com/hubspot/jinjava/lib/tag/eager/EagerTagDecorator.java
@@ -356,9 +356,11 @@ public static String buildSetTagForDeferredInChildContext(
     if (deferredValuesToSet.size() == 0) {
       return "";
     }
+    Map<Library, Set<String>> disabled = interpreter.getConfig().getDisabled();
     if (
-      interpreter.getConfig().getDisabled().containsKey(Library.TAG) &&
-      interpreter.getConfig().getDisabled().get(Library.TAG).contains(SetTag.TAG_NAME)
+      disabled != null &&
+      disabled.containsKey(Library.TAG) &&
+      disabled.get(Library.TAG).contains(SetTag.TAG_NAME)
     ) {
       throw new DisabledException("set tag disabled");
     }