inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-07-31 17:39:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feature/TimeZoneFixUnitTest_no' into 'master'

Browse Source 
Revert changes to getStartOfDay.

See merge request records-management/records-management!780
This commit is contained in:
Tom Page
2018-01-19 08:14:25 +00:00
parent ee6c2a0251 3b983d013f
commit 4d1c8624cf
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/audit/RecordsManagementAuditServiceImpl.java
View File

@@ -37,7 +37,6 @@ import java.io.IOException;
import java.io.OutputStreamWriter; import java.io.OutputStreamWriter;
import java.io.Serializable; import java.io.Serializable;
import java.io.Writer; import java.io.Writer;
import java.time.temporal.ChronoUnit;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Calendar; import java.util.Calendar;
import java.util.Collections; import java.util.Collections;
@@ -1140,8 +1139,7 @@ public class RecordsManagementAuditServiceImpl extends AbstractLifecycleBean
*/ */
protected Date getStartOfDay(Date date) protected Date getStartOfDay(Date date)
{ {
date = (date == null ? new Date() : date); return DateUtils.truncate(date == null ? new Date() : date, Calendar.DATE);
return Date.from(date.toInstant().truncatedTo(ChronoUnit.DAYS));
} }
/** /**