From 2fd8f8d592e32fb46ea2616398145745ded9a0c0 Mon Sep 17 00:00:00 2001
From: Bill Smith <wsmith@unicon.net>
Date: Thu, 14 Feb 2019 14:46:40 -0700
Subject: [PATCH] [SHIBUI-1058][SHIBUI-1230]

Fixed a casting bug related to converting a boolean attribute to a
string value.
---
 .../tier/shibboleth/admin/ui/service/JPAEntityServiceImpl.java | 3 ++-
 1 file changed, 2 insertions(+), 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 ae443a055..9e32d371c 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,8 @@ public List<Attribute> getAttributeListFromRelyingPartyOverridesRepresentation(M
                 case BOOLEAN:
                     if (overrideProperty.getPersistType() != null &&
                         !overrideProperty.getPersistType().equalsIgnoreCase("boolean") &&
-                            ((entry.getValue() instanceof Boolean && (Boolean)entry.getValue()) || Boolean.valueOf((String)entry.getValue()))) {
+                            ((entry.getValue() instanceof Boolean && (Boolean)entry.getValue()) ||
+                            ((entry.getValue() instanceof String) && Boolean.valueOf((String)entry.getValue())))) {
                         list.add(attributeUtility.createAttributeWithStringValues(overrideProperty.getAttributeName(),
                                                                                    overrideProperty.getAttributeFriendlyName(),
                                                                                    overrideProperty.getPersistValue()));