Author: bleny Date: 2014-06-05 16:29:53 +0200 (Thu, 05 Jun 2014) New Revision: 2005 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2005 Log: refs #4493 fix some NPEs Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/ContactTopiaDao.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/CompanySynthesis.java Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/ContactTopiaDao.java =================================================================== --- trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/ContactTopiaDao.java 2014-06-05 14:15:10 UTC (rev 2004) +++ trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/ContactTopiaDao.java 2014-06-05 14:29:53 UTC (rev 2005) @@ -410,6 +410,7 @@ HqlAndParametersBuilder<Contact> hqlAndParametersBuilder = toContactHqlAndParametersBuilder(filter); hqlAndParametersBuilder.addEquals(Contact.PROPERTY_STATE, ContactState.OBSERVATION_DONE.ordinal()); + hqlAndParametersBuilder.addNotNull(Contact.PROPERTY_DATA_INPUT_DATE); String hql = "select c.sampleRow.company.topiaId, c.observationEndDate, c.dataInputDate " + hqlAndParametersBuilder.getHql(); Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/CompanySynthesis.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/CompanySynthesis.java 2014-06-05 14:15:10 UTC (rev 2004) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/CompanySynthesis.java 2014-06-05 14:29:53 UTC (rev 2005) @@ -76,11 +76,11 @@ } public double getDataReliabilityRatio() { + Long reliableObservationsCount = getReliableObservationsCount(); Long doneObservationsCount = getContactsStatesStatistics().get(ContactState.OBSERVATION_DONE); double ratio = 0.; - if (doneObservationsCount != null && doneObservationsCount > 0) { - double reliableObservationsCount = (double) getReliableObservationsCount(); - ratio = reliableObservationsCount / doneObservationsCount; + if (reliableObservationsCount != null && doneObservationsCount != null && doneObservationsCount > 0) { + ratio = (double) reliableObservationsCount / doneObservationsCount; } return ratio; }