Merge pull request #12382 from BrentEaston/BeanshellStartUp

12382 - Prevent NPE in Beanshell execution during module initialisation
vassalengine · Jun 18, 2023 · ea3ad3a · ea3ad3a
2 parents 4d8adb4 + d5353b8
commit ea3ad3a
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/vassal-app/src/main/java/VASSAL/script/ExpressionInterpreter.java b/vassal-app/src/main/java/VASSAL/script/ExpressionInterpreter.java
@@ -275,7 +275,7 @@ public String evaluate(PropertySource ps, java.util.Map<String, String> properti
         // Check for a propoerty in the passed property Map, then check the source if not found
         Object prop = properties == null ? null : properties.get(name);
         if (prop == null) {
-          prop = localized ? source.getLocalizedProperty(name) : source.getProperty(name);
+          prop = (source == null) ? "" : localized ? source.getLocalizedProperty(name) : source.getProperty(name);
         }
         final String value = prop == null ? "" : prop.toString();
         if (audit != null) {