azkaban-uncached

Merge pull request #61 from pooorman/master Fix Bug: Timezone

11/2/2013 1:14:47 AM

Details

diff --git a/src/java/azkaban/execapp/AzkabanExecutorServer.java b/src/java/azkaban/execapp/AzkabanExecutorServer.java
index e024d24..41681c0 100644
--- a/src/java/azkaban/execapp/AzkabanExecutorServer.java
+++ b/src/java/azkaban/execapp/AzkabanExecutorServer.java
@@ -174,6 +174,7 @@ public class AzkabanExecutorServer {
 		// Setup time zone
 		if (azkabanSettings.containsKey(DEFAULT_TIMEZONE_ID)) {
 			String timezone = azkabanSettings.getString(DEFAULT_TIMEZONE_ID);
+			System.setProperty("user.timezone", timezone);
 			TimeZone.setDefault(TimeZone.getTimeZone(timezone));
 			DateTimeZone.setDefault(DateTimeZone.forID(timezone));
 
diff --git a/src/java/azkaban/webapp/AzkabanWebServer.java b/src/java/azkaban/webapp/AzkabanWebServer.java
index 6096b68..7bb0282 100644
--- a/src/java/azkaban/webapp/AzkabanWebServer.java
+++ b/src/java/azkaban/webapp/AzkabanWebServer.java
@@ -200,6 +200,7 @@ public class AzkabanWebServer extends AzkabanServer {
 		// Setup time zone
 		if (props.containsKey(DEFAULT_TIMEZONE_ID)) {
 			String timezone = props.getString(DEFAULT_TIMEZONE_ID);
+			System.setProperty("user.timezone", timezone);
 			TimeZone.setDefault(TimeZone.getTimeZone(timezone));
 			DateTimeZone.setDefault(DateTimeZone.forID(timezone));
 			logger.info("Setting timezone to " + timezone);