Author: tchemit Date: 2013-09-30 20:19:54 +0200 (Mon, 30 Sep 2013) New Revision: 1257 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1257 Log: fix test Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/FishingOperationPersistenceServiceImpl.java Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/FishingOperationPersistenceServiceImpl.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/FishingOperationPersistenceServiceImpl.java 2013-09-30 17:52:20 UTC (rev 1256) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/FishingOperationPersistenceServiceImpl.java 2013-09-30 18:19:54 UTC (rev 1257) @@ -740,7 +740,10 @@ boolean withGear = source.getGear() != null; - Short gearRankOrder = withGear ? source.getGear().getRankOrder() : 0; + Short gearRankOrder = null; + if (withGear) { + gearRankOrder = source.getGear().getRankOrder(); + } if (gearRankOrder == null) { gearRankOrder = 1; @@ -931,8 +934,8 @@ // GearUseFeatures.Gear if (!withGear) { gearUseFeatures.setGear(null); - gearUseFeatures.setRankOrder((short)0); - } else { + gearUseFeatures.setRankOrder((short) 0); + } else { gearUseFeatures.setGear(load(GearImpl.class, source.getGear().getIdAsInt())); gearUseFeatures.setRankOrder(gearRankOrder); }