You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by mc...@apache.org on 2013/02/26 23:13:38 UTC
[19/28] git commit: refs/heads/vim51_win8 - usage: Fix regression
build fail from fc3905fb, missing closing parenthesis
usage: Fix regression build fail from fc3905fb, missing closing parenthesis
We've to test our commits, build 'em before committing :)
Signed-off-by: Rohit Yadav <bh...@apache.org>
(cherry picked from commit c47f685b1f323d1d8316ef6067c11cf14ecabbc6)
Signed-off-by: Rohit Yadav <bh...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/0a1a207a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/0a1a207a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/0a1a207a
Branch: refs/heads/vim51_win8
Commit: 0a1a207a196de052342bb84c987c557bf58ad32d
Parents: fc3905f
Author: Rohit Yadav <bh...@apache.org>
Authored: Tue Feb 26 16:35:42 2013 +0530
Committer: Rohit Yadav <bh...@apache.org>
Committed: Tue Feb 26 16:41:16 2013 +0530
----------------------------------------------------------------------
usage/src/com/cloud/usage/UsageManagerImpl.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/0a1a207a/usage/src/com/cloud/usage/UsageManagerImpl.java
----------------------------------------------------------------------
diff --git a/usage/src/com/cloud/usage/UsageManagerImpl.java b/usage/src/com/cloud/usage/UsageManagerImpl.java
index 66af7f4..85ea60b 100644
--- a/usage/src/com/cloud/usage/UsageManagerImpl.java
+++ b/usage/src/com/cloud/usage/UsageManagerImpl.java
@@ -1430,7 +1430,7 @@ public class UsageManagerImpl extends ManagerBase implements UsageManager, Runna
timeSinceJob = now - lastSuccess;
}
- if ((timeSinceJob > 0) && (timeSinceJob > (aggregationDurationMillis - 100)) {
+ if ((timeSinceJob > 0) && (timeSinceJob > (aggregationDurationMillis - 100))) {
if (timeToJob > (aggregationDurationMillis/2)) {
if (s_logger.isDebugEnabled()) {
s_logger.debug("it's been " + timeSinceJob + " ms since last usage job and " + timeToJob + " ms until next job, scheduling an immediate job to catch up (aggregation duration is " + m_aggregationDuration + " minutes)");