X-Git-Url: https://gerrit.onap.org/r/gitweb?p=dmaap%2Fkafka11aaf.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fonap%2Fdmaap%2Fcommonauth%2Fkafka%2Fbase%2Fauthorization%2FCadi3AAFProvider.java;fp=src%2Fmain%2Fjava%2Forg%2Fonap%2Fdmaap%2Fcommonauth%2Fkafka%2Fbase%2Fauthorization%2FCadi3AAFProvider.java;h=b5193cc383a0bc1fe023480ec41c542389d10343;hp=56fd1bbe1a1874a1d445d7aaf517f3bd78e4217e;hb=a5389cc3594ee259631163bdebd4bf86cef357aa;hpb=4431ebfb911dcbd1dfec1a82c1646fb2402e31b2

diff --git a/src/main/java/org/onap/dmaap/commonauth/kafka/base/authorization/Cadi3AAFProvider.java b/src/main/java/org/onap/dmaap/commonauth/kafka/base/authorization/Cadi3AAFProvider.java
index 56fd1bb..b5193cc 100644
--- a/src/main/java/org/onap/dmaap/commonauth/kafka/base/authorization/Cadi3AAFProvider.java
+++ b/src/main/java/org/onap/dmaap/commonauth/kafka/base/authorization/Cadi3AAFProvider.java
@@ -54,10 +54,16 @@ public class Cadi3AAFProvider implements AuthorizationProvider {
 	private static final Logger logger = LoggerFactory.getLogger(Cadi3AAFProvider.class);
 
 	static {
-
+		if (System.getProperty("enableCadi") != null) {
+			if (System.getProperty("enableCadi").equals("true")) {
+				enableCadi = true;
+			}
+		}
+         else{
 		if (System.getenv("enableCadi") != null && System.getenv("enableCadi").equals("true")) {
 			enableCadi = true;
 		}
+         }
 		Configuration config = Configuration.getConfiguration();
 		try {
 			if (config == null) {
@@ -181,7 +187,6 @@ public class Cadi3AAFProvider implements AuthorizationProvider {
 
 		logger.info("^Event received  with   username " + userId);
 
-		boolean enableCadi = System.getenv("enableCadi") == null ? true : false;
 		if (!enableCadi) {
 			return null;
 		} else {