------------------------------------------------------------
revno: 1780
committer: Lars <larsh...@larshelg-laptop>
branch nick: trunk
timestamp: Tue 2010-04-13 16:05:21 +0200
message:
Fixed bug, could not delete maplegendset which was member of a mapview. This
was caused by a nullpointerexception which happened since the maplegendset
property of mapview is optional.
modified:
dhis-2/dhis-services/dhis-service-mapping/src/main/java/org/hisp/dhis/mapping/MapViewDeletionHandler.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-mapping/src/main/java/org/hisp/dhis/mapping/MapViewDeletionHandler.java'
--- dhis-2/dhis-services/dhis-service-mapping/src/main/java/org/hisp/dhis/mapping/MapViewDeletionHandler.java 2010-04-12 21:23:33 +0000
+++ dhis-2/dhis-services/dhis-service-mapping/src/main/java/org/hisp/dhis/mapping/MapViewDeletionHandler.java 2010-04-13 14:05:21 +0000
@@ -115,7 +115,7 @@
{
for ( MapView mapView : mappingService.getAllMapViews() )
{
- if ( mapView.getMapLegendSet().equals( mapLegendSet ) )
+ if ( mapView.getMapLegendSet() != null && mapView.getMapLegendSet().equals( mapLegendSet ) ) // MapLegendSet is optional
{
mappingService.deleteMapView( mapView );
}
_______________________________________________
Mailing list: https://launchpad.net/~dhis2-devs
Post to : [email protected]
Unsubscribe : https://launchpad.net/~dhis2-devs
More help : https://help.launchpad.net/ListHelp
