[NOISSUE]

allow inverted retrieve of attributes
TIER · Mar 5, 2019 · e3c322a · e3c322a
1 parent cd289d1
commit e3c322a
Show file tree

Hide file tree

Showing 2 changed files 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
@@ -660,7 +660,7 @@ public EntityDescriptorRepresentation createRepresentationFromDescriptor(org.ope
                                     !overrideProperty.getPersistType().equals(overrideProperty.getDisplayType())) {
                                     attributeValues = overrideProperty.getPersistValue().equals(getValueFromXMLObject(jpaAttribute.getAttributeValues().get(0)));
                                 } else {
-                                    attributeValues = Boolean.valueOf(((XSBoolean) jpaAttribute.getAttributeValues()
+                                    attributeValues = Boolean.valueOf(overrideProperty.getInvert()) ^ Boolean.valueOf(((XSBoolean) jpaAttribute.getAttributeValues()
                                             .get(0)).getStoredValue());
                                 }
                                 break;

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
@@ -110,7 +110,7 @@ edu.internet2.tier.shibboleth.admin.ui.domain.Attribute getAttributeFromObjectAn
                                     overrideProperty.getAttributeFriendlyName(),
                                     Boolean.valueOf((String) o));
                         } else {
-                            Boolean value = Boolean.valueOf(overrideProperty.getInvert()) ? !(Boolean)o : (Boolean)o;
+                            Boolean value = Boolean.valueOf(overrideProperty.getInvert()) ^ (Boolean)o;
                             return attributeUtility.createAttributeWithBooleanValue(overrideProperty.getAttributeName(),
                                     overrideProperty.getAttributeFriendlyName(),
                                     value);