------------------------------------------------------------
revno: 22049
committer: Morten Olav Hansen <[email protected]>
branch nick: dhis2
timestamp: Fri 2016-02-26 11:58:07 +0700
message:
dont validate/update attributeValues if collection is empty
modified:
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/attribute/DefaultAttributeService.java
--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk
Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/attribute/DefaultAttributeService.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/attribute/DefaultAttributeService.java 2016-02-15 04:57:22 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/attribute/DefaultAttributeService.java 2016-02-26 04:58:07 +0000
@@ -278,6 +278,11 @@
{
List<ValidationViolation> validationViolations = new ArrayList<>();
+ if ( attributeValues.isEmpty() )
+ {
+ return validationViolations;
+ }
+
Map<String, AttributeValue> attributeValueMap = attributeValues.stream()
.collect( Collectors.toMap( av -> av.getAttribute().getUid(), av -> av ) );
@@ -339,6 +344,11 @@
@Override
public <T extends IdentifiableObject> void updateAttributeValues( T object, Set<AttributeValue> attributeValues ) throws Exception
{
+ if ( attributeValues.isEmpty() )
+ {
+ return;
+ }
+
Map<String, AttributeValue> attributeValueMap = attributeValues.stream()
.collect( Collectors.toMap( av -> av.getAttribute().getUid(), av -> av ) );
_______________________________________________
Mailing list: https://launchpad.net/~dhis2-devs
Post to : [email protected]
Unsubscribe : https://launchpad.net/~dhis2-devs
More help : https://help.launchpad.net/ListHelp
