------------------------------------------------------------
revno: 21544
committer: Lars Helge Overland <[email protected]>
branch nick: dhis2
timestamp: Tue 2015-12-29 15:21:45 +0100
message:
Maintance, option combos, including a check for invalid category combo
modified:
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataelement/DefaultDataElementCategoryService.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/dataelement/DefaultDataElementCategoryService.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataelement/DefaultDataElementCategoryService.java 2015-11-20 04:02:48 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataelement/DefaultDataElementCategoryService.java 2015-12-29 14:21:45 +0000
@@ -690,6 +690,12 @@
@Override
public void updateOptionCombos( DataElementCategoryCombo categoryCombo )
{
+ if ( categoryCombo == null || !categoryCombo.isValid() )
+ {
+ log.warn( "Category combo is null or invalid, could not update option combos: " + categoryCombo );
+ return;
+ }
+
List<DataElementCategoryOptionCombo> generatedOptionCombos = categoryCombo.generateOptionCombosList();
Set<DataElementCategoryOptionCombo> persistedOptionCombos = categoryCombo.getOptionCombos();
_______________________________________________
Mailing list: https://launchpad.net/~dhis2-devs
Post to : [email protected]
Unsubscribe : https://launchpad.net/~dhis2-devs
More help : https://help.launchpad.net/ListHelp
