Author: tchemit Date: 2013-09-23 15:00:24 +0200 (Mon, 23 Sep 2013) New Revision: 1207 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1207 Log: refs #3297: [DONNEES INDIVIDUELLES] g?\195?\169rer les colonnes du tableau dans le protocole (fix NPE if no caracteristics defined in protocol) Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiDataContext.java Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiDataContext.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiDataContext.java 2013-09-23 12:59:33 UTC (rev 1206) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiDataContext.java 2013-09-23 13:00:24 UTC (rev 1207) @@ -40,6 +40,7 @@ import fr.ifremer.tutti.persistence.entities.referential.Species; import fr.ifremer.tutti.persistence.entities.referential.Vessel; import fr.ifremer.tutti.service.config.TuttiServiceConfig; +import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -692,14 +693,22 @@ if (log.isInfoEnabled()) { log.info("Loading defaultIndividualObservationCaracteristics"); } - List<Caracteristic> list ; + List<Caracteristic> list; if (isProtocolFilled()) { List<String> individualObservationPmfmId = getProtocol().getIndividualObservationPmfmId(); - list = Lists.newArrayListWithCapacity(individualObservationPmfmId.size()); - for (String id : individualObservationPmfmId) { - Caracteristic caracteristic = service.getCaracteristic(Integer.valueOf(id)); - list.add(caracteristic); + if (CollectionUtils.isEmpty(individualObservationPmfmId)) { + + // no conf + list = Lists.newArrayList(); + + } else { + list = Lists.newArrayListWithCapacity(individualObservationPmfmId.size()); + for (String id : individualObservationPmfmId) { + Caracteristic caracteristic = service.getCaracteristic(Integer.valueOf(id)); + list.add(caracteristic); + } } + } else { // no default caracteristics to use list = Lists.newArrayList(); @@ -718,7 +727,7 @@ public void resetProtocol() { protocol = null; lengthStepCaracteristics = null; - defaultIndividualObservationCaracteristics=null; + defaultIndividualObservationCaracteristics = null; } public void resetGears() {