inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-14 17:58:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged 5.1.N (5.1.1) to HEAD (5.1)

Browse Source 
114226 abozianu: Merged 5.0.N (5.0.3) to 5.1.N (5.1.1)
      114208 amorarasu: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
         114103 mrogers: MNT-14685 Fix to ISO8601Converter.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@123581 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2016-03-11 17:26:21 +00:00
parent 1f322c24f3
commit 0cc1587581
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
source/java/org/alfresco/rest/workflow/api/impl/ISO8601Converter.java
View File

@@ -34,14 +34,14 @@ public class ISO8601Converter implements Converter
else if (value instanceof java.sql.Date)
{
java.sql.Date valueX = (java.sql.Date)value;
return new Date(valueX.getTime());
result = new Date(valueX.getTime());
}
else if (value instanceof java.sql.Time)
{
java.sql.Time valueX = (java.sql.Time)value;
return new Date(valueX.getTime());
result = new Date(valueX.getTime());
}
if(value instanceof Calendar)
else if(value instanceof Calendar)
{
result = ((Calendar)value).getTime();
}