From fd182b806ee88cb35d4170dadd35c724244617d6 Mon Sep 17 00:00:00 2001
From: kishan <kishan@cloud.com>
Date: Mon, 30 Jan 2012 14:26:15 +0530
Subject: [PATCH] Bug 13143: Use defaults for timezone when config is null or
 empty Status 13143: resolved fixed Reviewed-By: Nitin

---
 usage/src/com/cloud/usage/UsageManagerImpl.java | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/usage/src/com/cloud/usage/UsageManagerImpl.java b/usage/src/com/cloud/usage/UsageManagerImpl.java
index 41bf3382db8..dc7a8722968 100644
--- a/usage/src/com/cloud/usage/UsageManagerImpl.java
+++ b/usage/src/com/cloud/usage/UsageManagerImpl.java
@@ -175,7 +175,9 @@ public class UsageManagerImpl implements UsageManager, Runnable {
             m_sanityCheckInterval = Integer.parseInt(sanityCheckInterval);
         }
 
-        m_usageTimezone = TimeZone.getTimeZone(aggreagationTimeZone);
+        if(aggreagationTimeZone != null && !aggreagationTimeZone.isEmpty()){  
+        	m_usageTimezone = TimeZone.getTimeZone(aggreagationTimeZone);
+        }
         s_logger.debug("Usage stats aggregation time zone: "+aggreagationTimeZone);
         
         try {
@@ -196,7 +198,7 @@ public class UsageManagerImpl implements UsageManager, Runnable {
             m_jobExecTime.set(Calendar.MINUTE, minutes);
             m_jobExecTime.set(Calendar.SECOND, 0);
             m_jobExecTime.set(Calendar.MILLISECOND, 0);
-            if(execTimeZone != null){
+            if(execTimeZone != null && !execTimeZone.isEmpty()){
                 m_jobExecTime.setTimeZone(TimeZone.getTimeZone(execTimeZone));
             }