summaryrefslogtreecommitdiffstats
path: root/src/main/java/org/onap/dmaap/commonauth/kafka/base/authorization/Cadi3AAFProvider.java
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/org/onap/dmaap/commonauth/kafka/base/authorization/Cadi3AAFProvider.java')
-rw-r--r--src/main/java/org/onap/dmaap/commonauth/kafka/base/authorization/Cadi3AAFProvider.java9
1 files changed, 7 insertions, 2 deletions
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 {