Author: tchemit Date: 2013-11-26 15:22:59 +0100 (Tue, 26 Nov 2013) New Revision: 1389 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1389 Log: fixes #3854: [CAMPAGNE] erreur null au moment d'enregistrer Modified: branches/tutti-with-ifremer-shared/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/SaveCruiseAction.java Modified: branches/tutti-with-ifremer-shared/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/SaveCruiseAction.java =================================================================== --- branches/tutti-with-ifremer-shared/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/SaveCruiseAction.java 2013-11-26 08:03:42 UTC (rev 1388) +++ branches/tutti-with-ifremer-shared/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/SaveCruiseAction.java 2013-11-26 14:22:59 UTC (rev 1389) @@ -70,8 +70,8 @@ if (!TuttiEntities.isNew(bean)) { Cruise oldCruise = persistenceService.getCruise(bean.getId()); - // check gear has not changed - if (!oldCruise.getVessel().equals(bean.getVessel())) { + // check vessel has not changed + if (ObjectUtils.notEqual(oldCruise.getVessel(), bean.getVessel())) { // if so ask user confirmation String htmlMessage = String.format(