Author: kmorin Date: 2013-03-19 16:30:18 +0100 (Tue, 19 Mar 2013) New Revision: 661 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/661 Log: refs #2156 [CAPTURE] - Esp?\195?\168ces - Erreur de r?\195?\169cup?\195?\169ration des captures quand un lot a ?\195?\169t?\195?\169 cat?\195?\169goris?\195?\169 par age Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/BatchPersistenceServiceImpl.java Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/BatchPersistenceServiceImpl.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/BatchPersistenceServiceImpl.java 2013-03-19 13:10:52 UTC (rev 660) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/BatchPersistenceServiceImpl.java 2013-03-19 15:30:18 UTC (rev 661) @@ -757,7 +757,11 @@ if (sm != null) { SampleCategoryEnum sampleCategory = enumeration.getSampleCategoryByPmfmId(sm.getPmfm().getId()); if (sampleCategory != null) { - setSampleCategoryQualitative(target, sm.getPmfm().getId(), sm.getNumericalValue(), sm.getAlphanumericalValue(), sm.getQualitativeValue().getId()); + Integer qualitativeId = null; + if (sm.getQualitativeValue() != null) { + qualitativeId = sm.getQualitativeValue().getId(); + } + setSampleCategoryQualitative(target, sm.getPmfm().getId(), sm.getNumericalValue(), sm.getAlphanumericalValue(), qualitativeId); } }