Author: bleny Date: 2010-11-18 11:37:57 +0000 (Thu, 18 Nov 2010) New Revision: 786 Log: no average reactivity when company never returned data Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSynthesisImpl.java Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSynthesisImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSynthesisImpl.java 2010-11-18 10:45:27 UTC (rev 785) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSynthesisImpl.java 2010-11-18 11:37:57 UTC (rev 786) @@ -519,27 +519,33 @@ List<Object[]> res = transaction.findByQuery(query); for (Object[] row : res) { - String rowCompanyName = (String)row[0]; - Date rowDataInputDate = (Date)row[1]; - Date rowTideBeginDate = (Date)row[2]; + String rowCompanyName = (String) row[0]; + Date rowDataInputDate = (Date) row[1]; + Date rowTideBeginDate = (Date) row[2]; - int nbDays = DateUtil.getDifferenceInDays(rowTideBeginDate, rowDataInputDate); - if (log.isDebugEnabled()) { log.debug("Company : " + rowCompanyName); log.debug("tideBegin : " + rowTideBeginDate); log.debug("dataInput : " + rowDataInputDate); - log.debug("nbDays : " + nbDays); } - ContactAverageReactivity avg = results.get(rowCompanyName); - if (avg == null) { - avg = new ContactAverageReactivityImpl(); - avg.setCompanyName(rowCompanyName); - results.put(rowCompanyName, avg); + if (rowDataInputDate != null) { + + int nbDays = DateUtil.getDifferenceInDays(rowTideBeginDate, rowDataInputDate); + + if (log.isDebugEnabled()) { + log.debug("nbDays : " + nbDays); + } + + ContactAverageReactivity avg = results.get(rowCompanyName); + if (avg == null) { + avg = new ContactAverageReactivityImpl(); + avg.setCompanyName(rowCompanyName); + results.put(rowCompanyName, avg); + } + + avg.addValue(nbDays); } - - avg.addValue(nbDays); } return results.values(); }