SHIBUI-836: wip

TIER · Sep 12, 2018 · c688c14 · c688c14
1 parent f070306
commit c688c14
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/...ier/shibboleth/admin/ui/service/ShibbolethPlaceholderTokenAwareValueResolvingService.java b/...ier/shibboleth/admin/ui/service/ShibbolethPlaceholderTokenAwareValueResolvingService.java
@@ -29,7 +29,11 @@ public class ShibbolethPlaceholderTokenAwareValueResolvingService implements Tok
 
     @Override
     public String resolveValueFromTokenPlaceholder(String potentialTokenPlaceholder) {
-        requireNonNull(potentialTokenPlaceholder, "potentialTokenPlaceholder must not be null");
+        //Ignore nulls.
+        if(potentialTokenPlaceholder == null) {
+            return potentialTokenPlaceholder;
+        }
+
         if(potentialTokenPlaceholder.contains(SHIB_IDP_PLACEHOLDER_PREEFIX)) {
             String normalizedTokenPlaceholder =
                     potentialTokenPlaceholder.replace(SHIB_IDP_PLACEHOLDER_PREEFIX, STANDART_PLACEHOLDER_PREFIX);