This is an automated email from the git hooks/post-receive script. New commit to branch feature/7520 in repository observe. See http://git.codelutin.com/observe.git commit 5b64f735b90cbe9baa4dd8aab5a4f77c12466af0 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Fri Sep 11 11:20:59 2015 +0200 fix npe (refs #7470 #7520) --- .../src/main/java/fr/ird/observe/services/ObserveServiceTopia.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/ObserveServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/ObserveServiceTopia.java index 9353706..58dc5fd 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/ObserveServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/ObserveServiceTopia.java @@ -349,7 +349,7 @@ public class ObserveServiceTopia implements ObserveService { Date lasUpdate = ((FollowedUpdateEntity) entity).getLastUpdate(); Date currentUpdate = ((FollowedUpdateDto) dto).getLastUpdate(); - if (! lasUpdate.equals(currentUpdate)) { + if (lasUpdate != null && ! lasUpdate.equals(currentUpdate)) { throw new ConcurrentModificationException(lasUpdate, currentUpdate); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.