X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=PolicyEngineAPI%2Fsrc%2Fmain%2Fjava%2Forg%2Fopenecomp%2Fpolicy%2Fstd%2FStdPolicyEngine.java;h=0732c3cf5e6c1ec6f4a6d8af8e937954ff015893;hb=fc5c07705edc4dcb7083b39116a43844bb6a1490;hp=5b10f306628999f04e1d1646b14adc80406b85b9;hpb=87c95be02a8a4d77e165dede90777e811b59dcae;p=policy%2Fengine.git

diff --git a/PolicyEngineAPI/src/main/java/org/openecomp/policy/std/StdPolicyEngine.java b/PolicyEngineAPI/src/main/java/org/openecomp/policy/std/StdPolicyEngine.java
index 5b10f3066..0732c3cf5 100644
--- a/PolicyEngineAPI/src/main/java/org/openecomp/policy/std/StdPolicyEngine.java
+++ b/PolicyEngineAPI/src/main/java/org/openecomp/policy/std/StdPolicyEngine.java
@@ -82,7 +82,7 @@ import org.openecomp.policy.common.logging.flexlogger.FlexLogger;
 import org.openecomp.policy.common.logging.flexlogger.Logger;
 import org.openecomp.policy.models.APIDictionaryResponse;
 import org.openecomp.policy.models.APIPolicyConfigResponse;
-import org.openecomp.policy.utils.AAFPolicyClient.Environment;
+import org.openecomp.policy.utils.AAFEnvironment;
 import org.openecomp.policy.utils.PolicyUtils;
 import org.openecomp.policy.xacml.api.XACMLErrorConstants;
 import org.springframework.core.io.FileSystemResource;
@@ -689,15 +689,13 @@ public class StdPolicyEngine {
                 LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + "Error while connecting to " + pdps.get(0), e);
                 exception = new HttpClientErrorException(HttpStatus.INTERNAL_SERVER_ERROR, e.getMessage());
             }
-            finally{
-                if(result == null){
-                    Collections.rotate(pdps, -1);
-                    Collections.rotate(encoding, -1);
-                    pdpsCount++;
-                }else{
-                    break;
-                }
-            }
+            if(result == null){
+        		Collections.rotate(pdps, -1);
+        		Collections.rotate(encoding, -1);
+        		pdpsCount++;
+        	}else{
+        		break;
+        	}
         }
         if(exception != null && exception.getStatusCode()!=null){
             if(exception.getStatusCode().equals(HttpStatus.UNAUTHORIZED)){
@@ -902,13 +900,13 @@ public class StdPolicyEngine {
 				pass = clientKey.trim();
 			}
 			setClientEncoding();
-			environment = prop.getProperty("ENVIRONMENT", Environment.DEVL.toString());
-			if(environment.equalsIgnoreCase(Environment.TEST.toString())){
-				environment = Environment.TEST.toString();
-			}else if(environment.equalsIgnoreCase(Environment.PROD.toString())){
-				environment = Environment.PROD.toString();
+			environment = prop.getProperty("ENVIRONMENT", AAFEnvironment.DEVL.toString());
+			if(environment.equalsIgnoreCase(AAFEnvironment.TEST.toString())){
+				environment = AAFEnvironment.TEST.toString();
+			}else if(environment.equalsIgnoreCase(AAFEnvironment.PROD.toString())){
+				environment = AAFEnvironment.PROD.toString();
 			}else{
-				environment = Environment.DEVL.toString();
+				environment = AAFEnvironment.DEVL.toString();
 			}
 			// Initializing the values.
 			pdps = new ArrayList<>();