Author: tchemit Date: 2012-02-16 23:53:05 +0100 (Thu, 16 Feb 2012) New Revision: 317 Url: http://forge.codelutin.com/repositories/revision/echobase/317 Log: fix voyage client code Modified: trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/data/VoyageImpl.java Modified: trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/data/VoyageImpl.java =================================================================== --- trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/data/VoyageImpl.java 2012-02-16 22:52:48 UTC (rev 316) +++ trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/data/VoyageImpl.java 2012-02-16 22:53:05 UTC (rev 317) @@ -99,13 +99,15 @@ Set<Vessel> result = Sets.newHashSet(); - for (Transit transit : getTransit()) { + if (!isTransitEmpty()) { + for (Transit transit : getTransit()) { - Collection<Vessel> vesselsOfTransit = - Collections2.transform( - transit.getTransect(), - EchoBaseFunctions.TRANSECT_BY_VESSEL); - result.addAll(vesselsOfTransit); + Collection<Vessel> vesselsOfTransit = + Collections2.transform( + transit.getTransect(), + EchoBaseFunctions.TRANSECT_BY_VESSEL); + result.addAll(vesselsOfTransit); + } } return result; } @@ -113,9 +115,11 @@ @Override public Collection<Operation> getOperations(Vessel vessel) { + Preconditions.checkNotNull(vessel); + Collection<Operation> result = Lists.newArrayList(); - if (isTransitEmpty()) { + if (!isTransitEmpty()) { for (Transit t : transit) { Transect transect = t.getTransect(vessel);