Author: bpoussin Date: 2014-07-21 13:02:35 +0200 (Mon, 21 Jul 2014) New Revision: 4052 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4052 Log: fixes #5464 - NPE in method StrategyMonthInfoImpl#getMetierWithProportion() Modified: trunk/src/main/java/fr/ifremer/isisfish/entities/StrategyMonthInfoImpl.java Modified: trunk/src/main/java/fr/ifremer/isisfish/entities/StrategyMonthInfoImpl.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/entities/StrategyMonthInfoImpl.java 2014-07-21 11:01:58 UTC (rev 4051) +++ trunk/src/main/java/fr/ifremer/isisfish/entities/StrategyMonthInfoImpl.java 2014-07-21 11:02:35 UTC (rev 4052) @@ -39,6 +39,7 @@ import fr.ifremer.isisfish.IsisFishRuntimeException; import fr.ifremer.isisfish.datastore.RegionStorage; import fr.ifremer.isisfish.datastore.StorageException; +import java.util.Collections; import org.nuiton.math.matrix.MatrixIterator; /** @@ -73,9 +74,14 @@ @Override public List<Metier> getMetierWithProportion() { MatrixND mat = super.getProportionMetier(); - List<Metier> result = new ArrayList<Metier>(mat.getDim(0)); - for (MatrixIterator i=mat.iteratorNotZero(); i.next();) { - result.add((Metier)i.getSemanticsCoordinates()[0]); + List<Metier> result; + if (mat == null) { + result = Collections.EMPTY_LIST; + } else { + result = new ArrayList<Metier>(mat.getDim(0)); + for (MatrixIterator i=mat.iteratorNotZero(); i.next();) { + result.add((Metier)i.getSemanticsCoordinates()[0]); + } } return result; }