Bug 13143: Use defaults for timezone when config is null or empty

kishan · kishan · commit fd182b806ee8 · 2012-01-30T14:26:15.000+05:30
Status 13143: resolved fixed
Reviewed-By: Nitin
diff --git a/usage/src/com/cloud/usage/UsageManagerImpl.java b/usage/src/com/cloud/usage/UsageManagerImpl.java
@@ -175,7 +175,9 @@ public boolean configure(String name, Map<String, Object> params) throws Configu
             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 boolean configure(String name, Map<String, Object> params) throws Configu
             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));
             }
 
