Author: bleny Date: 2013-08-29 14:47:46 +0200 (Thu, 29 Aug 2013) New Revision: 395 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revisions... Log: prevent an exception to be logged as error, add a precondition Modified: trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/LocationJsonAction.java trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/WithdrawItemAction.java Modified: trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/LocationJsonAction.java =================================================================== --- trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/LocationJsonAction.java 2013-08-29 11:19:42 UTC (rev 394) +++ trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/LocationJsonAction.java 2013-08-29 12:47:46 UTC (rev 395) @@ -69,7 +69,7 @@ } @Override - public String execute() throws InvalidMagalieBarcodeException { + public String execute() { MagalieUser magalieUser = session.getMagalieUser(); @@ -79,8 +79,18 @@ Building building = session.getBuilding(); - receptionLocation = service.getReceptionLocation(building, magalieUser, locationBarcode, articleId); + try { + receptionLocation = service.getReceptionLocation(building, magalieUser, locationBarcode, articleId); + + } catch (InvalidMagalieBarcodeException e) { + + if (log.isWarnEnabled()) { + log.warn("unable to find reception location for barcode '" + locationBarcode + "'"); + } + + } + return SUCCESS; } Modified: trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/WithdrawItemAction.java =================================================================== --- trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/WithdrawItemAction.java 2013-08-29 11:19:42 UTC (rev 394) +++ trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/WithdrawItemAction.java 2013-08-29 12:47:46 UTC (rev 395) @@ -193,6 +193,12 @@ @Override public String execute() { + if (log.isDebugEnabled()) { + log.debug("confirmation = " + confirmation); + } + + Preconditions.checkNotNull(confirmation, "absence de données de confirmation"); + if (confirmation.getStorageMovementIds().contains(null)) { if (log.isErrorEnabled()) {