You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bh...@apache.org on 2015/04/24 11:35:48 UTC
[2/2] git commit: updated refs/heads/master to 5c5873e
GetUsageRecordsCmd - Removed unnecessary adjust...
ToDayStart/End because ParamProcessWorker.java is taking care of building proper
date format with day start/end
This closes #185
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/5c5873ed
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/5c5873ed
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/5c5873ed
Branch: refs/heads/master
Commit: 5c5873edf1d6dcf5fc1442dada38078d73381a40
Parents: fe29998
Author: Ilia Shakitko <sh...@gmail.com>
Authored: Thu Apr 23 15:47:40 2015 +0200
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Fri Apr 24 11:35:00 2015 +0200
----------------------------------------------------------------------
server/src/com/cloud/usage/UsageServiceImpl.java | 19 ++++---------------
1 file changed, 4 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5c5873ed/server/src/com/cloud/usage/UsageServiceImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/usage/UsageServiceImpl.java b/server/src/com/cloud/usage/UsageServiceImpl.java
index 8cc40ca..df43a00 100644
--- a/server/src/com/cloud/usage/UsageServiceImpl.java
+++ b/server/src/com/cloud/usage/UsageServiceImpl.java
@@ -222,11 +222,11 @@ public class UsageServiceImpl extends ManagerBase implements UsageService, Manag
throw new InvalidParameterValueException("Incorrect Date Range. Start date: " + startDate + " is after end date:" + endDate);
}
TimeZone usageTZ = getUsageTimezone();
- Date adjustedStartDate = computeAdjustedTime(startDate, usageTZ, true);
- Date adjustedEndDate = computeAdjustedTime(endDate, usageTZ, false);
+ Date adjustedStartDate = computeAdjustedTime(startDate, usageTZ);
+ Date adjustedEndDate = computeAdjustedTime(endDate, usageTZ);
if (s_logger.isDebugEnabled()) {
- s_logger.debug("getting usage records for account: " + accountId + ", domainId: " + domainId + ", between " + startDate + " and " + endDate +
+ s_logger.debug("getting usage records for account: " + accountId + ", domainId: " + domainId + ", between " + adjustedStartDate + " and " + adjustedEndDate +
", using pageSize: " + cmd.getPageSizeVal() + " and startIndex: " + cmd.getStartIndex());
}
@@ -408,7 +408,7 @@ public class UsageServiceImpl extends ManagerBase implements UsageService, Manag
return true;
}
- private Date computeAdjustedTime(Date initialDate, TimeZone targetTZ, boolean adjustToDayStart) {
+ private Date computeAdjustedTime(Date initialDate, TimeZone targetTZ) {
Calendar cal = Calendar.getInstance();
cal.setTime(initialDate);
TimeZone localTZ = cal.getTimeZone();
@@ -428,17 +428,6 @@ public class UsageServiceImpl extends ManagerBase implements UsageService, Manag
}
calTS.add(Calendar.MILLISECOND, -1 * timezoneOffset);
- if (adjustToDayStart) {
- calTS.set(Calendar.HOUR_OF_DAY, 0);
- calTS.set(Calendar.MINUTE, 0);
- calTS.set(Calendar.SECOND, 0);
- calTS.set(Calendar.MILLISECOND, 0);
- } else {
- calTS.set(Calendar.HOUR_OF_DAY, 23);
- calTS.set(Calendar.MINUTE, 59);
- calTS.set(Calendar.SECOND, 59);
- calTS.set(Calendar.MILLISECOND, 999);
- }
return calTS.getTime();
}