Author: tchemit Date: 2012-08-29 13:16:30 +0200 (Wed, 29 Aug 2012) New Revision: 485 Url: http://forge.codelutin.com/repositories/revision/sammoa/485 Log: fixes #1430: Bug ?\195?\160 l'export des shp d'observation Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/io/output/map/ExportMapService.java Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/io/output/map/ExportMapService.java =================================================================== --- trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/io/output/map/ExportMapService.java 2012-08-29 10:51:15 UTC (rev 484) +++ trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/io/output/map/ExportMapService.java 2012-08-29 11:16:30 UTC (rev 485) @@ -521,8 +521,13 @@ record.put("SWIM_DIR", observation.getSwimDir()); record.put("CALVES", observation.getCalves()); record.put("PHOTO", observation.isPhoto()); - record.put("OBSERVER", observation.getObserverPosition().getObserver().getInitials()); - record.put("SIDE", observation.getObserverPosition().getPosition()); + ObserverPosition observerPosition = observation.getObserverPosition(); + if (observerPosition != null) { + if (observerPosition.getObserver() == null) { + record.put("OBSERVER", observerPosition.getObserver().getInitials()); + } + record.put("SIDE", observerPosition.getPosition()); + } record.put("STATUS", observation.getObservationStatus()); record.put("COMMENT", observation.getComment());