diff options
| author |   Liam Fallon <liam.fallon@ericsson.com> | 2018-09-18 19:19:39 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-09-18 19:19:39 +0000 |
| commit | 82f6d6809ddbceef8f8fdf2cfac2d80737f2e19b (patch) | |
| tree | 5af9720c1143850843a3b50f5f413830ef97c48f | |
| parent | 47066cb4750955f9eed0db0e772f6224151a11a2 (diff) | |
| parent | b92d82e71019c833988be383092457d07e189a57 (diff) | |
Merge "Remove override of parent aaf version"
| -rw-r--r-- | PolicyEngineUtils/pom.xml | 1 | ||||
| -rw-r--r-- | PolicyEngineUtils/src/main/java/org/onap/policy/utils/AAFPolicyClientImpl.java | 6 |
2 files changed, 5 insertions, 2 deletions
diff --git a/PolicyEngineUtils/pom.xml b/PolicyEngineUtils/pom.xml index f4bb5a09d..052d63785 100644 --- a/PolicyEngineUtils/pom.xml +++ b/PolicyEngineUtils/pom.xml @@ -99,7 +99,6 @@ <dependency> <groupId>org.onap.aaf.authz</groupId> <artifactId>aaf-cadi-aaf</artifactId> - <version>2.1.0</version> </dependency> <dependency> <groupId>com.google.code.gson</groupId> diff --git a/PolicyEngineUtils/src/main/java/org/onap/policy/utils/AAFPolicyClientImpl.java b/PolicyEngineUtils/src/main/java/org/onap/policy/utils/AAFPolicyClientImpl.java index 5c46c76f7..e65ac2780 100644 --- a/PolicyEngineUtils/src/main/java/org/onap/policy/utils/AAFPolicyClientImpl.java +++ b/PolicyEngineUtils/src/main/java/org/onap/policy/utils/AAFPolicyClientImpl.java @@ -190,7 +190,11 @@ public class AAFPolicyClientImpl implements AAFPolicyClient{ if(aafCon!=null && aafLurPerm !=null){ try { aafCon.basicAuth(userName, pass); - AAFPermission perm = new AAFPermission(type, instance, action); + // + // The first parameter is the namespace. At this point we will default + // to null until we are given a namespace to use. + // + AAFPermission perm = new AAFPermission(null, type, instance, action); final Principal p = new UnAuthPrincipal(userName); result = aafLurPerm.fish(p, perm); } catch (CadiException e) { |