From c9770e77779e3451d978600cccfc7db64ca5bc1b Mon Sep 17 00:00:00 2001
From: Abhinandan Prateek <abhinandan.prateek@shapeblue.com>
Date: Wed, 1 Jul 2015 15:03:43 +0530
Subject: [PATCH] merging fixes

---
 .../org/apache/cloudstack/api/command/QuotaCreditsCmd.java | 7 ++-----
 .../src/org/apache/cloudstack/quota/QuotaManager.java      | 3 +++
 .../src/org/apache/cloudstack/quota/QuotaManagerImpl.java  | 1 +
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/plugins/database/quota/src/org/apache/cloudstack/api/command/QuotaCreditsCmd.java b/plugins/database/quota/src/org/apache/cloudstack/api/command/QuotaCreditsCmd.java
index fd4332d108a..a14f5cf1693 100644
--- a/plugins/database/quota/src/org/apache/cloudstack/api/command/QuotaCreditsCmd.java
+++ b/plugins/database/quota/src/org/apache/cloudstack/api/command/QuotaCreditsCmd.java
@@ -17,8 +17,6 @@
 package org.apache.cloudstack.api.command;
 
 import javax.inject.Inject;
-import java.util.ArrayList;
-import java.util.List;
 
 import org.apache.log4j.Logger;
 import org.apache.cloudstack.api.APICommand;
@@ -32,7 +30,6 @@ import org.apache.cloudstack.api.response.QuotaCreditsResponse;
 import org.apache.cloudstack.context.CallContext;
 import org.apache.cloudstack.quota.QuotaManager;
 
-import com.cloud.user.Account;
 
 @APICommand(name = "quotaCredits", responseObject = QuotaCreditsResponse.class, description = "Add +-credits to an account", since = "4.2.0", requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
 public class QuotaCreditsCmd extends BaseListCmd {
@@ -110,9 +107,9 @@ public void execute() {
         throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "The account does not exists or has been removed/disabled");
     }
 
-    final QuotaCreditsResponse _credit_response = _quotaManager.addQuotaCredits(accountId, domainId, value, CallContext.current().getCallingAccount().getId());
+    final QuotaCreditsResponse credit_response = _quotaManager.addQuotaCredits(accountId, domainId, value, CallContext.current().getCallingAccount().getId());
 
-    setResponseObject(_credit_response);
+    setResponseObject(credit_response);
 }
 
 
diff --git a/plugins/database/quota/src/org/apache/cloudstack/quota/QuotaManager.java b/plugins/database/quota/src/org/apache/cloudstack/quota/QuotaManager.java
index cf29064323e..edbdf8b328b 100644
--- a/plugins/database/quota/src/org/apache/cloudstack/quota/QuotaManager.java
+++ b/plugins/database/quota/src/org/apache/cloudstack/quota/QuotaManager.java
@@ -20,6 +20,7 @@ import java.util.List;
 
 import org.apache.cloudstack.api.command.ListQuotaConfigurationsCmd;
 import org.apache.cloudstack.api.response.QuotaConfigurationResponse;
+import org.apache.cloudstack.api.response.QuotaCreditsResponse;
 
 import com.cloud.utils.Pair;
 import com.cloud.utils.component.PluggableService;
@@ -30,4 +31,6 @@ public interface QuotaManager extends PluggableService {
 
     QuotaConfigurationResponse createQuotaConfigurationResponse(QuotaConfigurationVO configuration);
 
+    QuotaCreditsResponse addQuotaCredits(Long accountId, Long domainId, Integer amount, Long updatedBy);
+
 }
diff --git a/plugins/database/quota/src/org/apache/cloudstack/quota/QuotaManagerImpl.java b/plugins/database/quota/src/org/apache/cloudstack/quota/QuotaManagerImpl.java
index 3c1c43f8ac0..0a72c31ae30 100644
--- a/plugins/database/quota/src/org/apache/cloudstack/quota/QuotaManagerImpl.java
+++ b/plugins/database/quota/src/org/apache/cloudstack/quota/QuotaManagerImpl.java
@@ -92,3 +92,4 @@ public QuotaCreditsResponse addQuotaCredits(Long accountId, Long domainId, Integ
 
 
 }
+