[SHIBUI-999]

Added a fix for dealing with ambiguous types stored in the relying party overrides map.
TIER · Nov 14, 2018 · 7833ae1 · 7833ae1
1 parent 836880d
commit 7833ae1
Showing 1 changed file with 10 additions and 4 deletions.
diff --git a/...nd/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/JPAEntityServiceImpl.java b/...nd/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/JPAEntityServiceImpl.java
@@ -106,14 +106,20 @@ public List<Attribute> getAttributeListFromRelyingPartyOverridesRepresentation(M
                 case BOOLEAN:
                     if (overrideProperty.getPersistType() != null &&
                         !overrideProperty.getPersistType().equalsIgnoreCase("boolean") &&
-                            (Boolean) entry.getValue()) {
+                            Boolean.valueOf((String)entry.getValue())) {
                         list.add(attributeUtility.createAttributeWithStringValues(overrideProperty.getAttributeName(),
                                                                                    overrideProperty.getAttributeFriendlyName(),
                                                                                    overrideProperty.getPersistValue()));
                     } else {
-                        list.add(attributeUtility.createAttributeWithBooleanValue(overrideProperty.getAttributeName(),
-                                                                                   overrideProperty.getAttributeFriendlyName(),
-                                                                                   (Boolean) entry.getValue()));
+                        if (entry.getValue() instanceof String) {
+                            list.add(attributeUtility.createAttributeWithBooleanValue(overrideProperty.getAttributeName(),
+                                    overrideProperty.getAttributeFriendlyName(),
+                                    Boolean.valueOf((String) entry.getValue())));
+                        } else {
+                            list.add(attributeUtility.createAttributeWithBooleanValue(overrideProperty.getAttributeName(),
+                                    overrideProperty.getAttributeFriendlyName(),
+                                    (Boolean) entry.getValue()));
+                        }
                     }
                     break;
                 case INTEGER: