From: Jorge Hernandez <jh1730@att.com>
Date: Mon, 15 Jan 2018 23:36:03 +0000 (+0000)
Subject: Merge "Local and Class variable name conflict resolved"
X-Git-Tag: v1.2.0~185
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=c7ebb39ee23233b0104d3a0f9b1f8fdd66911d18;hp=6d3cc4662712bb636b83f8a4da9938afe192a64a;p=policy%2Fengine.git

Merge "Local and Class variable name conflict resolved"
---

diff --git a/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/AutoPushController.java b/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/AutoPushController.java
index d308e7eda..50b9d6923 100644
--- a/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/AutoPushController.java
+++ b/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/AutoPushController.java
@@ -359,8 +359,8 @@ public class AutoPushController extends RestrictedBaseController{
 			policyContainer = new PDPPolicyContainer(group);
 			if(removePolicyData.size() > 0){
 				for(int i = 0 ; i < removePolicyData.size(); i++){
-					String data = removePolicyData.get(i).toString();
-					this.policyContainer.removeItem(data);
+					String polData = removePolicyData.get(i).toString();
+					this.policyContainer.removeItem(polData);
 				}
 				Set<PDPPolicy> changedPolicies = new HashSet<>();
 				changedPolicies.addAll((Collection<PDPPolicy>) this.policyContainer.getItemIds());
@@ -395,4 +395,4 @@ public class AutoPushController extends RestrictedBaseController{
 		return null;
 	}
 
-}
\ No newline at end of file
+}