Author: chatellier Date: 2011-04-05 12:34:58 +0000 (Tue, 05 Apr 2011) New Revision: 3234 Log: fix npe in test Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/PopulationSeasonInfoImpl.java Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/PopulationSeasonInfoImpl.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/PopulationSeasonInfoImpl.java 2011-04-05 12:11:10 UTC (rev 3233) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/PopulationSeasonInfoImpl.java 2011-04-05 12:34:58 UTC (rev 3234) @@ -250,7 +250,8 @@ public MatrixND getLengthChangeMatrix() { MatrixND matrix = super.getLengthChangeMatrix(); - if (matrix == null) { + // moved here dur to init bug in isis 3.3.0.x + if (matrix == null && getPopulation() != null) { matrix = createNoSpacializedChangeGroupMatrix(); }