Author: bleny Date: 2014-04-11 11:00:25 +0200 (Fri, 11 Apr 2014) New Revision: 1879 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1879 Log: refs #4483 consider a new sample row as recently updated Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSamplingPlan.java Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSamplingPlan.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSamplingPlan.java 2014-04-10 15:57:31 UTC (rev 1878) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSamplingPlan.java 2014-04-11 09:00:25 UTC (rev 1879) @@ -436,11 +436,12 @@ samplingStrategy = WaoUtils.l(locale,sampleRow.getSamplingStrategy()); sampleRowId = sampleRow.getTopiaId(); + // consider a recently created sample row as recently updated + latestSampleLogCreateDate = sampleRow.getTopiaCreateDate(); // compute lastSampleLogCreateDate if (sampleRow.isSampleRowLogNotEmpty()) { for (SampleRowLog sampleRowLog : sampleRow.getSampleRowLog()) { - if (latestSampleLogCreateDate == null || - sampleRowLog.getCreateDate().after(latestSampleLogCreateDate)) { + if (sampleRowLog.getCreateDate().after(latestSampleLogCreateDate)) { latestSampleLogCreateDate = sampleRowLog.getCreateDate(); } }