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

CLOUDSTACK-5404: Fix timezone bug in network usage

Browse Source 
(cherry picked from commit d5277a81e644c6db30cff12878cd3708aa28cc86)

Conflicts:

	engine/schema/src/com/cloud/usage/dao/UsageDaoImpl.java
This commit is contained in:
Wei Zhou 2014-01-09 14:07:53 +01:00
parent d56a962445
commit f012a2655d
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
engine/schema/src/com/cloud/usage/dao/UsageDaoImpl.java
View File

@ -18,7 +18,6 @@ package com.cloud.usage.dao;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.Timestamp;
import java.sql.Types;
import java.util.ArrayList;
import java.util.Date;
@ -434,8 +433,8 @@ public class UsageDaoImpl extends GenericDaoBase<UsageVO, Long> implements Usage
} else {
pstmt.setNull(15, Types.BIGINT);
}
pstmt.setTimestamp(16, new Timestamp(usageRecord.getStartDate().getTime()));
pstmt.setTimestamp(17, new Timestamp(usageRecord.getEndDate().getTime()));
pstmt.setString(16, DateUtil.getDateDisplayString(s_gmtTimeZone, usageRecord.getStartDate()));
pstmt.setString(17, DateUtil.getDateDisplayString(s_gmtTimeZone, usageRecord.getEndDate()));
if (usageRecord.getVirtualSize() != null) {
pstmt.setLong(18, usageRecord.getSize());
} else {