Merge branch 'feature/shibui-2380' of bitbucket.org:unicon/shib-idp-u…

…i into feature/shibui-2380
TIER · Oct 17, 2022 · 535fd5c · 535fd5c
2 parents 765dd32 + c654f28
commit 535fd5c
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/...n/java/edu/internet2/tier/shibboleth/admin/ui/service/JPAEntityDescriptorServiceImpl.java b/...n/java/edu/internet2/tier/shibboleth/admin/ui/service/JPAEntityDescriptorServiceImpl.java
@@ -517,7 +517,7 @@ private void setupSecurityRepresentationFromEntityDescriptor(EntityDescriptor ed
                 keyDescriptorRep.setElementType(keyInfoType);
                 if (keyInfoType != KeyDescriptorRepresentation.ElementType.unsupported) {
                     List<XMLObject> children = keyInfo.getOrderedChildren().stream().filter(xmlObj -> {
-                        boolean xmlWeDoNotWant = xmlObj instanceof KeyName || xmlObj instanceof KeyValue;
+                        boolean xmlWeDoNotWant = xmlObj instanceof KeyName || xmlObj instanceof KeyValue || xmlObj == null;
                         return !xmlWeDoNotWant;
                     }).collect(Collectors.toList());
                     XMLObject obj = children.get(0);
@@ -533,7 +533,7 @@ private void setupSecurityRepresentationFromEntityDescriptor(EntityDescriptor ed
 
     private KeyDescriptorRepresentation.ElementType determineKeyInfoType(KeyInfo keyInfo) {
         List<XMLObject> children = keyInfo.getOrderedChildren().stream().filter(xmlObj -> {
-            boolean xmlWeDoNotWant = xmlObj instanceof KeyName || xmlObj instanceof KeyValue;
+            boolean xmlWeDoNotWant = xmlObj instanceof KeyName || xmlObj instanceof KeyValue || xmlObj == null;
             return !xmlWeDoNotWant;
         }).collect(Collectors.toList());
         if (children.size() < 1) {