From d582ad290491aad5c54d8c9f59b75a6309a57711 Mon Sep 17 00:00:00 2001 From: Alan Davis Date: Tue, 11 Feb 2014 22:15:25 +0000 Subject: [PATCH] Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud) 57810: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3) 57787: Merged V4.1-BUG-FIX (4.1.8) to V4.2-BUG-FIX (4.2.1) 57748: Merged V4.1.7 (4.1.7) to V4.1-BUG-FIX (4.1.8) 57711: Merged DEV to V4.1.7 (4.1.7) 57677: MNT-9790 : CLONE - bulkimport fails when there is a very large LastModified timestamp. - Using a correct ISO date parser, added a fix for date, year of that is less then 1848, test added git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61892 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../alfresco/repo/bulkimport/impl/DirectoryAnalyserImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/java/org/alfresco/repo/bulkimport/impl/DirectoryAnalyserImpl.java b/source/java/org/alfresco/repo/bulkimport/impl/DirectoryAnalyserImpl.java index f575291fbb..e63d723ee4 100644 --- a/source/java/org/alfresco/repo/bulkimport/impl/DirectoryAnalyserImpl.java +++ b/source/java/org/alfresco/repo/bulkimport/impl/DirectoryAnalyserImpl.java @@ -42,10 +42,10 @@ import org.alfresco.repo.bulkimport.ImportableItem.FileType; import org.alfresco.repo.bulkimport.MetadataLoader; import org.alfresco.repo.dictionary.constraint.NameChecker; import org.alfresco.service.cmr.dictionary.ConstraintException; +import org.alfresco.util.ISO8601DateFormat; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.extensions.surf.exception.PlatformRuntimeException; -import org.springframework.extensions.surf.util.ISO8601DateFormat; /** * This class provides the implementation for directory analysis, the process by