Author: fdesbois Date: 2012-08-20 16:10:50 +0200 (Mon, 20 Aug 2012) New Revision: 446 Url: http://forge.codelutin.com/repositories/revision/sammoa/446 Log: resolve NPE in FakeGpsHandler Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/device/gps/BaseGpsHandler.java trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/device/gps/FakeGpsHandler.java Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/device/gps/BaseGpsHandler.java =================================================================== --- trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/device/gps/BaseGpsHandler.java 2012-08-20 14:10:36 UTC (rev 445) +++ trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/device/gps/BaseGpsHandler.java 2012-08-20 14:10:50 UTC (rev 446) @@ -209,7 +209,9 @@ boolean sameLocation = GeoPoints.equal(location, lastLocation); - logger.debug("sameLocation={} [{} :: {}]", new Object[]{sameLocation, location, lastLocation}); + if (logger.isTraceEnabled()) { + logger.trace("sameLocation={} [{} :: {}]", new Object[]{sameLocation, location, lastLocation}); + } // reset nbFailures if location hasn't changed if (sameLocation) { Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/device/gps/FakeGpsHandler.java =================================================================== --- trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/device/gps/FakeGpsHandler.java 2012-08-20 14:10:36 UTC (rev 445) +++ trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/device/gps/FakeGpsHandler.java 2012-08-20 14:10:50 UTC (rev 446) @@ -28,6 +28,7 @@ import fr.ulr.sammoa.application.device.DeviceTechnicalException; import fr.ulr.sammoa.persistence.GeoPoint; import fr.ulr.sammoa.persistence.GeoPointImpl; +import fr.ulr.sammoa.persistence.GeoPoints; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -132,7 +133,8 @@ GeoPoint result; // Location already saved, return null (i.e. no new location) if (currentLocation == null || currentLocation.getTopiaId() != null) { - result = null; + result = new GeoPointImpl(GeoPoints.EMPTY_COORDINATE, GeoPoints.EMPTY_COORDINATE); + currentLocation.setRecordTime(new Date()); } else { result = currentLocation;