This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository wikitty. See http://git.nuiton.org/wikitty.git commit 5ab14c94841047b81ab75b18477d32ed068ff39f Author: Benjamin POUSSIN <poussin@codelutin.com> Date: Sun Aug 2 14:20:11 2015 +0200 fixes bug when returned wikitty is null (if id not exist any more, or if security service replace unaccessable wikitty by null) --- .../src/main/java/org/nuiton/wikitty/WikittyClient.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyClient.java b/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyClient.java index b1df263..0ef17fd 100644 --- a/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyClient.java +++ b/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyClient.java @@ -1975,12 +1975,15 @@ public class WikittyClient { } if (!ids.isEmpty()) { - Set<Wikitty> wikitties = restore(ids.keySet()); - for (Wikitty w : wikitties) { - String id = w.getWikittyId(); + List<String> idsList = new ArrayList<String>(ids.keySet()); + List<Wikitty> wikitties = restore(idsList); + for (int i=0; i<wikitties.size(); i++) { + String id = idsList.get(i); + Wikitty w = wikitties.get(i); + ListObjectOrMap.Key key = ids.get(id); Object o = key.getValue(); - if (o instanceof BusinessEntity) { + if (w != null && o instanceof BusinessEntity) { // il faut mettre a jour le wikitty avec les champs de BusinessEntity WikittyUtil.updateWikitty(w, (BusinessEntity)o); } -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.