From f849c917ce81fba925e5da05d1a9e2dd22eae561 Mon Sep 17 00:00:00 2001
From: Jj! <jj@unicon.net>
Date: Wed, 14 Nov 2018 09:26:10 -0600
Subject: [PATCH] [SHIBUI-999] cleanup

---
 .../tier/shibboleth/admin/ui/service/JPAEntityServiceImpl.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/JPAEntityServiceImpl.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/JPAEntityServiceImpl.java
index 0f96e0895..ae443a055 100644
--- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/JPAEntityServiceImpl.java
+++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/JPAEntityServiceImpl.java
@@ -106,7 +106,7 @@ public List<Attribute> getAttributeListFromRelyingPartyOverridesRepresentation(M
                 case BOOLEAN:
                     if (overrideProperty.getPersistType() != null &&
                         !overrideProperty.getPersistType().equalsIgnoreCase("boolean") &&
-                            Boolean.valueOf((String)entry.getValue())) {
+                            ((entry.getValue() instanceof Boolean && (Boolean)entry.getValue()) || Boolean.valueOf((String)entry.getValue()))) {
                         list.add(attributeUtility.createAttributeWithStringValues(overrideProperty.getAttributeName(),
                                                                                    overrideProperty.getAttributeFriendlyName(),
                                                                                    overrideProperty.getPersistValue()));