Author: Bavencoff Date: 2013-05-28 14:32:42 +0200 (Tue, 28 May 2013) New Revision: 201 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revisions... Log: refs #2164 : storage transfer Modified: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/StorageTransferService.java Modified: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/StorageTransferService.java =================================================================== --- trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/StorageTransferService.java 2013-05-28 12:09:11 UTC (rev 200) +++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/StorageTransferService.java 2013-05-28 12:32:42 UTC (rev 201) @@ -11,6 +11,7 @@ import com.franciaflex.magalie.persistence.entity.StoredArticle; import com.franciaflex.magalie.services.MagalieService; import com.franciaflex.magalie.services.MagalieServiceContext; +import com.google.common.base.Preconditions; import com.google.common.collect.Lists; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -78,24 +79,15 @@ public StoredArticle findStoredArticle(String storedArticleId) { + Preconditions.checkArgument(storedArticleId != null); + MagaliePersistenceContext persistenceContext = serviceContext.getPersistenceContext(); StoredArticleDao storedArticleDao = persistenceContext.getStoredArticleDao(); - StoredArticle storedArticle; + StoredArticle storedArticle = storedArticleDao.findById(storedArticleId); - try { - - storedArticle = storedArticleDao.findById(storedArticleId); - - } catch (Exception e) { - - storedArticle = null; - - } - - return storedArticle; - + return storedArticle; } public void confirmStorageTransfer(MagalieUser magalieUser, StoredArticle storedArticle, double Quantity, Location destinationLocation ) {