From dc0e369ee4c9c302b89a8b8c04e3ed2a857a2ecf Mon Sep 17 00:00:00 2001 From: Aron Roberts Date: Thu, 10 May 2012 19:50:32 -0700 Subject: [PATCH] CSPACE-5137: Fixed error in comparison logic in authority item validator handlers. --- .../services/concept/nuxeo/ConceptValidatorHandler.java | 2 +- .../services/location/nuxeo/LocationValidatorHandler.java | 2 +- .../organization/nuxeo/OrganizationValidatorHandler.java | 2 +- .../services/person/nuxeo/PersonValidatorHandler.java | 2 +- .../services/place/nuxeo/PlaceValidatorHandler.java | 2 +- .../services/taxonomy/nuxeo/TaxonValidatorHandler.java | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/services/concept/service/src/main/java/org/collectionspace/services/concept/nuxeo/ConceptValidatorHandler.java b/services/concept/service/src/main/java/org/collectionspace/services/concept/nuxeo/ConceptValidatorHandler.java index 1bd1a5b56..12a758aac 100644 --- a/services/concept/service/src/main/java/org/collectionspace/services/concept/nuxeo/ConceptValidatorHandler.java +++ b/services/concept/service/src/main/java/org/collectionspace/services/concept/nuxeo/ConceptValidatorHandler.java @@ -138,7 +138,7 @@ public class ConceptValidatorHandler extends ValidatorHandlerImpl { ConceptTermGroupList termGroupList = concept.getConceptTermGroupList(); List termGroups = termGroupList.getConceptTermGroup(); for (ConceptTermGroup termGroup : termGroups) { - if (Tools.isBlank(termGroup.getTermName()) || Tools.isBlank(termGroup.getTermDisplayName())) { + if (Tools.isBlank(termGroup.getTermName()) && Tools.isBlank(termGroup.getTermDisplayName())) { return false; } } diff --git a/services/location/service/src/main/java/org/collectionspace/services/location/nuxeo/LocationValidatorHandler.java b/services/location/service/src/main/java/org/collectionspace/services/location/nuxeo/LocationValidatorHandler.java index ac1e52f0d..fd72db9ab 100644 --- a/services/location/service/src/main/java/org/collectionspace/services/location/nuxeo/LocationValidatorHandler.java +++ b/services/location/service/src/main/java/org/collectionspace/services/location/nuxeo/LocationValidatorHandler.java @@ -138,7 +138,7 @@ public class LocationValidatorHandler extends ValidatorHandlerImpl { LocTermGroupList termGroupList = person.getLocTermGroupList(); List termGroups = termGroupList.getLocTermGroup(); for (LocTermGroup termGroup : termGroups) { - if (Tools.isBlank(termGroup.getTermName()) || Tools.isBlank(termGroup.getTermDisplayName())) { + if (Tools.isBlank(termGroup.getTermName()) && Tools.isBlank(termGroup.getTermDisplayName())) { return false; } } diff --git a/services/organization/service/src/main/java/org/collectionspace/services/organization/nuxeo/OrganizationValidatorHandler.java b/services/organization/service/src/main/java/org/collectionspace/services/organization/nuxeo/OrganizationValidatorHandler.java index 36b4acadd..a48aa4899 100644 --- a/services/organization/service/src/main/java/org/collectionspace/services/organization/nuxeo/OrganizationValidatorHandler.java +++ b/services/organization/service/src/main/java/org/collectionspace/services/organization/nuxeo/OrganizationValidatorHandler.java @@ -138,7 +138,7 @@ public class OrganizationValidatorHandler extends ValidatorHandlerImpl { OrgTermGroupList termGroupList = organization.getOrgTermGroupList(); List termGroups = termGroupList.getOrgTermGroup(); for (OrgTermGroup termGroup : termGroups) { - if (Tools.isBlank(termGroup.getTermName()) || Tools.isBlank(termGroup.getTermDisplayName())) { + if (Tools.isBlank(termGroup.getTermName()) && Tools.isBlank(termGroup.getTermDisplayName())) { return false; } } diff --git a/services/person/service/src/main/java/org/collectionspace/services/person/nuxeo/PersonValidatorHandler.java b/services/person/service/src/main/java/org/collectionspace/services/person/nuxeo/PersonValidatorHandler.java index 2066c5c11..bca6a4fdf 100644 --- a/services/person/service/src/main/java/org/collectionspace/services/person/nuxeo/PersonValidatorHandler.java +++ b/services/person/service/src/main/java/org/collectionspace/services/person/nuxeo/PersonValidatorHandler.java @@ -137,7 +137,7 @@ public class PersonValidatorHandler extends ValidatorHandlerImpl { PersonTermGroupList termGroupList = person.getPersonTermGroupList(); List termGroups = termGroupList.getPersonTermGroup(); for (PersonTermGroup termGroup : termGroups) { - if (Tools.isBlank(termGroup.getTermName()) || Tools.isBlank(termGroup.getTermDisplayName())) { + if (Tools.isBlank(termGroup.getTermName()) && Tools.isBlank(termGroup.getTermDisplayName())) { return false; } } diff --git a/services/place/service/src/main/java/org/collectionspace/services/place/nuxeo/PlaceValidatorHandler.java b/services/place/service/src/main/java/org/collectionspace/services/place/nuxeo/PlaceValidatorHandler.java index d5c2c5d87..9b330b5e3 100644 --- a/services/place/service/src/main/java/org/collectionspace/services/place/nuxeo/PlaceValidatorHandler.java +++ b/services/place/service/src/main/java/org/collectionspace/services/place/nuxeo/PlaceValidatorHandler.java @@ -139,7 +139,7 @@ public class PlaceValidatorHandler extends ValidatorHandlerImpl { PlaceTermGroupList termGroupList = place.getPlaceTermGroupList(); List termGroups = termGroupList.getPlaceTermGroup(); for (PlaceTermGroup termGroup : termGroups) { - if (Tools.isBlank(termGroup.getTermName()) || Tools.isBlank(termGroup.getTermDisplayName())) { + if (Tools.isBlank(termGroup.getTermName()) && Tools.isBlank(termGroup.getTermDisplayName())) { return false; } } diff --git a/services/taxonomy/service/src/main/java/org/collectionspace/services/taxonomy/nuxeo/TaxonValidatorHandler.java b/services/taxonomy/service/src/main/java/org/collectionspace/services/taxonomy/nuxeo/TaxonValidatorHandler.java index 51b85ff94..7d455a36c 100644 --- a/services/taxonomy/service/src/main/java/org/collectionspace/services/taxonomy/nuxeo/TaxonValidatorHandler.java +++ b/services/taxonomy/service/src/main/java/org/collectionspace/services/taxonomy/nuxeo/TaxonValidatorHandler.java @@ -138,7 +138,7 @@ public class TaxonValidatorHandler extends ValidatorHandlerImpl { TaxonTermGroupList termGroupList = organization.getTaxonTermGroupList(); List termGroups = termGroupList.getTaxonTermGroup(); for (TaxonTermGroup termGroup : termGroups) { - if (Tools.isBlank(termGroup.getTermName()) || Tools.isBlank(termGroup.getTermDisplayName())) { + if (Tools.isBlank(termGroup.getTermName()) && Tools.isBlank(termGroup.getTermDisplayName())) { return false; } } -- 2.47.3