apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Status 13143: resolved fixed
Reviewed-By: Nitin
This commit is contained in:
kishan 2012-01-30 14:26:15 +05:30
parent 1e38c289aa
commit fd182b806e
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
usage/src/com/cloud/usage/UsageManagerImpl.java
View File

@ -175,7 +175,9 @@ public class UsageManagerImpl implements UsageManager, Runnable {
m_sanityCheckInterval = Integer.parseInt(sanityCheckInterval); 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); s_logger.debug("Usage stats aggregation time zone: "+aggreagationTimeZone);
try { try {
@ -196,7 +198,7 @@ public class UsageManagerImpl implements UsageManager, Runnable {
m_jobExecTime.set(Calendar.MINUTE, minutes); m_jobExecTime.set(Calendar.MINUTE, minutes);
m_jobExecTime.set(Calendar.SECOND, 0); m_jobExecTime.set(Calendar.SECOND, 0);
m_jobExecTime.set(Calendar.MILLISECOND, 0); m_jobExecTime.set(Calendar.MILLISECOND, 0);
if(execTimeZone != null){ if(execTimeZone != null && !execTimeZone.isEmpty()){
m_jobExecTime.setTimeZone(TimeZone.getTimeZone(execTimeZone)); m_jobExecTime.setTimeZone(TimeZone.getTimeZone(execTimeZone));
} }