diff --git a/src/main/java/no/nibio/vips/logic/service/ObservationService.java b/src/main/java/no/nibio/vips/logic/service/ObservationService.java index 1a8c8b3d9a66bb8872c8a8ead47f2ce715e6372f..861dbfb180de6e983481906f774951ac9b746e61 100755 --- a/src/main/java/no/nibio/vips/logic/service/ObservationService.java +++ b/src/main/java/no/nibio/vips/logic/service/ObservationService.java @@ -976,7 +976,7 @@ public class ObservationService { mergeObs.setStatusChangedByUserId(user.getUserId()); mergeObs.setStatusChangedTime(now); mergeObs.setStatusTypeId(ObservationStatusType.STATUS_APPROVED); - } else if(!newStatusTypeId.equals(originalStatusTypeId)) { + } else if(originalStatusTypeId != null && !newStatusTypeId.equals(originalStatusTypeId)) { LOGGER.info("Change status from {} to {} for observation {}", originalStatusTypeId, newStatusTypeId, mergeObs.getObservationId()); mergeObs.setStatusChangedByUserId(user.getUserId()); mergeObs.setStatusChangedTime(now);