Author: bleny Date: 2014-09-10 18:19:31 +0200 (Wed, 10 Sep 2014) New Revision: 2251 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2251 Log: Correction des erreurs de compilation suite ?\195?\160 fusion Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/ContactsFilter.java trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/ContactTopiaDao.java Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/ContactsFilter.java =================================================================== --- trunk/wao-persistence/src/main/java/fr/ifremer/wao/ContactsFilter.java 2014-09-10 15:53:16 UTC (rev 2250) +++ trunk/wao-persistence/src/main/java/fr/ifremer/wao/ContactsFilter.java 2014-09-10 16:19:31 UTC (rev 2251) @@ -417,7 +417,6 @@ clone.contactStates = contactStates == null ? null : new HashSet<>(contactStates); clone.dataReliabilities = dataReliabilities == null ? null : new HashSet<>(dataReliabilities); clone.actualSamplingStrategies = actualSamplingStrategies == null ? null : new HashSet<>(actualSamplingStrategies); - clone.observationTypes = observationTypes == null ? null : new HashSet<>(observationTypes); clone.observedDataControls = observedDataControls == null ? null : new HashSet<>(observedDataControls); clone.observerIds = observerIds == null ? null : new HashSet<>(observerIds); clone.terrestrialLocationIds = terrestrialLocationIds == null ? null : new HashSet<>(terrestrialLocationIds); 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-09-10 15:53:16 UTC (rev 2250) +++ trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/ContactTopiaDao.java 2014-09-10 16:19:31 UTC (rev 2251) @@ -123,8 +123,7 @@ } if (filter.getPeriodTo() != null) { - Date periodTo = DateUtil.setMaxTimeOfDay(filter.getPeriodTo()); - query.addLowerOrEquals(periodProperty, periodTo); + query.addLowerOrEquals(periodProperty, filter.getPeriodTo()); } if (CollectionUtils.isNotEmpty(filter.getContactIds())) {