X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=ONAP-PAP-REST%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fpolicy%2Fpap%2Fxacml%2Frest%2Fmodel%2FRemoveGroupPolicy.java;h=d05a1ab6eaab2b4f9b7ef01ba1ce571dcf6de5e1;hb=refs%2Fchanges%2F09%2F11009%2F1;hp=7645535b03987e8124b45b2d2b248d551de3184a;hpb=461b2b7eeca1586423349bc0c4c65f80f027292d;p=policy%2Fengine.git

diff --git a/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/model/RemoveGroupPolicy.java b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/model/RemoveGroupPolicy.java
index 7645535b0..d05a1ab6e 100644
--- a/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/model/RemoveGroupPolicy.java
+++ b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/model/RemoveGroupPolicy.java
@@ -35,7 +35,7 @@ public class RemoveGroupPolicy {
 	//Container from where we are fetching the policies
 	private static PDPPolicyContainer policyContainer;
 		
-	private final RemoveGroupPolicy self = this;
+	private RemoveGroupPolicy self = this;
 	private StdPDPGroup updatedObject;
 	private final StdPDPGroup group;
 	private boolean isSaved = false;
@@ -51,8 +51,7 @@ public class RemoveGroupPolicy {
 		if (this.group == null) {
 			return;
 		}
-
-		RemoveGroupPolicy.policyContainer = new PDPPolicyContainer(group);
+		setRemoveGroupPolicy(new PDPPolicyContainer(group));
 
 		RemoveGroupPolicy.policyContainer.removeItem(policy);
 									
@@ -62,13 +61,16 @@ public class RemoveGroupPolicy {
 		
 	}
 	
-	@SuppressWarnings("unchecked")
+	private static void setRemoveGroupPolicy(PDPPolicyContainer pdpPolicyContainer) {
+        RemoveGroupPolicy.policyContainer = pdpPolicyContainer;
+    }
+
+    @SuppressWarnings("unchecked")
 	protected void doSave() {
 		if (this.group == null) {
 			return;
 		}
 		
-		//StdPDPGroup pdpGroup = (StdPDPGroup) group;
 		StdPDPGroup updatedGroupObject = new StdPDPGroup(
 				group.getId(), 
 				group.isDefaultGroup(),