This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository wao. See http://git.codelutin.com/wao.git commit c2f0262159149ae5c8484f4db63af6da05b52e25 Author: Brendan Le Ny <bleny@codelutin.com> Date: Mon Feb 9 13:59:43 2015 +0100 Correction d'une NPE potentielle, a priori pas de raisons qu'elles se produise (refs #6621) --- .../fr/ifremer/wao/web/action/administration/EditWaoUserAction.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/EditWaoUserAction.java b/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/EditWaoUserAction.java index 5c161ee..34c9b18 100644 --- a/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/EditWaoUserAction.java +++ b/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/EditWaoUserAction.java @@ -71,7 +71,9 @@ public class EditWaoUserAction extends WaoJspActionSupport implements Preparable updateWaoUserCommand = service.newUpdateWaoUserCommand(getObsProgram(), optionalWaoUserId, optionalOrganisationId); - setOrganisationId(updateWaoUserCommand.getWaoUser().getOrganisation().getCompany().getTopiaId()); + if (updateWaoUserCommand.getWaoUser().getOrganisation() != null) { + setOrganisationId(updateWaoUserCommand.getWaoUser().getOrganisation().getCompany().getTopiaId()); + } } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.