Merge pull request CESNET#3149 from Vojtech-Sassmann/fixConf

Core - fixed optional ns config options
xkostka2 · Apr 6, 2021 · eec8f2d · eec8f2d
2 parents edd5059 + 43569ee
commit eec8f2d
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/perun-core/src/main/java/cz/metacentrum/perun/core/impl/SponsoredAccountsConfigLoader.java b/perun-core/src/main/java/cz/metacentrum/perun/core/impl/SponsoredAccountsConfigLoader.java
@@ -40,7 +40,7 @@ public Map<String, NamespaceRules> loadSponsoredAccountsConfig() {
 
 		} catch(RuntimeException e) {
 			throw new InternalErrorException("Configuration file has invalid syntax. Configuration file: " +
-				configurationPath.getFilename());
+				configurationPath.getFilename(), e);
 		}
 
 		return namespacesRules;
@@ -69,9 +69,9 @@ private Set<NamespaceRules> loadNamespacesRulesFromJsonNode(JsonNode rootNode) {
 			namespaceRules.setDefaultEmail(defaultEmail.asText());
 			namespaceRules.setRequiredAttributes(requiredAttributes);
 			namespaceRules.setOptionalAttributes(optionalAttributes);
-			if (!csvGenHeader.isNull())
+			if (csvGenHeader != null && !csvGenHeader.isNull())
 				namespaceRules.setCsvGenHeader(csvGenHeader.asText());
-			if (!csvGenPlaceholder.isNull())
+			if (csvGenPlaceholder != null && !csvGenPlaceholder.isNull())
 				namespaceRules.setCsvGenPlaceholder(csvGenPlaceholder.asText());
 
 			rules.add(namespaceRules);