Author: tchemit Date: 2012-06-12 12:13:48 +0200 (Tue, 12 Jun 2012) New Revision: 3450 Url: http://chorem.org/repositories/revision/pollen/3450 Log: always use new date from serviceContext Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollFeedService.java trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollService.java trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/PreventRuleService.java trunk/pollen-ui-struts2/src/test/resources/pollendb.h2.db Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollFeedService.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollFeedService.java 2012-06-12 09:08:23 UTC (rev 3449) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollFeedService.java 2012-06-12 10:13:48 UTC (rev 3450) @@ -269,7 +269,7 @@ entry = new SyndEntryImpl(); entry.setTitle(title); entry.setLink(voteUrl.getUrl()); - entry.setPublishedDate(new Date()); + entry.setPublishedDate(serviceContext.getCurrentTime()); description = new SyndContentImpl(); description.setType("text/plain"); description.setValue(content); Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollService.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollService.java 2012-06-12 09:08:23 UTC (rev 3449) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollService.java 2012-06-12 10:13:48 UTC (rev 3450) @@ -724,7 +724,7 @@ choice.setValidate(true); } } - Date now = new Date(); + Date now = serviceContext.getCurrentTime(); if (poll.getEndDate() == null || now.before(poll.getEndDate())) { poll.setEndDate(now); } Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/PreventRuleService.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/PreventRuleService.java 2012-06-12 09:08:23 UTC (rev 3449) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/PreventRuleService.java 2012-06-12 10:13:48 UTC (rev 3450) @@ -78,7 +78,7 @@ // envoi d'un email si endDate-nowDate <= preventRuleSensibility if (poll.getEndDate() != null) { - Date now = new Date(); + Date now = serviceContext.getCurrentTime(); // timeValue = endDate-nowDate long timeValue = poll.getEndDate().getTime() - now.getTime(); Modified: trunk/pollen-ui-struts2/src/test/resources/pollendb.h2.db =================================================================== (Binary files differ)