------------------------------------------------------------
revno: 10948
committer: Lars Helge Øverland <[email protected]>
branch nick: dhis2
timestamp: Thu 2013-05-23 10:46:12 +0200
message:
Null check
modified:
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/common/DefaultDimensionService.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/common/DefaultDimensionService.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/common/DefaultDimensionService.java 2013-05-19 18:49:47 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/common/DefaultDimensionService.java 2013-05-23 08:46:12 +0000
@@ -214,6 +214,11 @@
*/
private void mergeDimensionalObjects( BaseAnalyticalObject object, List<DimensionalObject> dimensions )
{
+ if ( object == null || dimensions == null )
+ {
+ return;
+ }
+
for ( DimensionalObject dimension : dimensions )
{
DimensionType type = getDimensionType( dimension.getDimension() );
_______________________________________________
Mailing list: https://launchpad.net/~dhis2-devs
Post to : [email protected]
Unsubscribe : https://launchpad.net/~dhis2-devs
More help : https://help.launchpad.net/ListHelp
