Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)

58489: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      58379: MNT-9888: WorkflowModelBuilderTest is susceptible to timezone issues
       - Fix unit tests, because they fails in build 75.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61989 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2014-02-11 23:36:11 +00:00
parent 03b22967cc
commit fd77ceb85f
5 changed files with 18 additions and 11 deletions

View File

@@ -87,7 +87,7 @@ public abstract class AbstractMetadataExtracterTest extends TestCase
long now = System.currentTimeMillis();
TempFileProvider.TempFileCleanerJob.removeFiles(now);
TimeZone tz = TimeZone.getTimeZone("Europe/London");
TimeZone tz = TimeZone.getTimeZone("GMT");
TimeZone.setDefault(tz);
// Joda time has already grabbed the JVM zone so re-set it here
DateTimeZone.setDefault(DateTimeZone.forTimeZone(tz));