[Wao-commits] r1554 - in trunk/wao-business/src/main/java/fr/ifremer/wao: bean io/csv2/models

12 Mar 2012

Author: bleny
Date: 2012-03-12 12:38:27 +0100 (Mon, 12 Mar 2012)
New Revision: 1554

Url: http://forge.codelutin.com/repositories/revision/wao/1554

Log:
Anomalie #958: Erreur ?\195?\160 l'export du plan ObsDeb
-NPE lorsque une ligne du plan n'a pas d'unit?\195?\169 d'observation associ?\195?\169e


Modified:
   trunk/wao-business/src/main/java/fr/ifremer/wao/bean/SamplingFilterValuesImpl.java
   trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/ObsDebSamplingPlanImportExportModel.java

Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/bean/SamplingFilterValuesImpl.java
===================================================================

--- trunk/wao-business/src/main/java/fr/ifremer/wao/bean/SamplingFilterValuesImpl.java	2012-03-12 11:36:36 UTC (rev 1553)
+++ trunk/wao-business/src/main/java/fr/ifremer/wao/bean/SamplingFilterValuesImpl.java	2012-03-12 11:38:27 UTC (rev 1554)
@@ -124,10 +124,12 @@
             addAllObservers(sampleRow.getObservers());
             if (sampleRow.isFieldWorkObservation()) {
                 TerrestrialDivision observationUnit = sampleRow.getObservationUnit();
-                addObservationUnits(observationUnit);
-                addSkillZone(observationUnit);
-                addSubPopulation(observationUnit);
-                addRegionIfremers(observationUnit.getRegionIfremer());
+                if (observationUnit != null) {
+                    addObservationUnits(observationUnit);
+                    addSkillZone(observationUnit);
+                    addSubPopulation(observationUnit);
+                    addRegionIfremers(observationUnit.getRegionIfremer());
+                }
             } else {
                 addRegionIfremers(sampleRow.getTerrestrialLocation());
             }

Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/ObsDebSamplingPlanImportExportModel.java
===================================================================
--- trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/ObsDebSamplingPlanImportExportModel.java	2012-03-12 11:36:36 UTC (rev 1553)
+++ trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/ObsDebSamplingPlanImportExportModel.java	2012-03-12 11:38:27 UTC (rev 1554)
@@ -115,7 +115,11 @@
 
         @Override
         public String format(TerrestrialDivision terrestrialDivision) {
-            return terrestrialDivision.getObservationUnitCode();
+            String observationUnitCode = "";
+            if (terrestrialDivision != null) {
+                observationUnitCode = terrestrialDivision.getObservationUnitCode();
+            }
+            return observationUnitCode;
         }
 
         public void setCurrentRegionCode(String regionCode) {

    

[Wao-commits] r1554 - in trunk/wao-business/src/main/java/fr/ifremer/wao: bean io/csv2/models

bleny＠users.forge.codelutin.com