diff options
| author |   Pamela Dragosh <pdragosh@research.att.com> | 2018-03-21 13:20:54 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-03-21 13:20:54 +0000 |
| commit | e53bd66cc71fcc3f7dff762054790c382d7dd499 (patch) | |
| tree | e457e55abfb060d978508e2480a368ea294dc929 /ONAP-XACML | |
| parent | 6e00f46e0c2ee4dbbdb0e222e6f361210d1a0da1 (diff) | |
| parent | eef3c224cb6cad4b82a96938ade1e42ca881eea2 (diff) | |
Merge "Fix all bugs reported by Sonar in policy/engine"
Diffstat (limited to 'ONAP-XACML')
| -rw-r--r-- | ONAP-XACML/src/main/java/org/onap/policy/xacml/std/pap/StdEngine.java | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/ONAP-XACML/src/main/java/org/onap/policy/xacml/std/pap/StdEngine.java b/ONAP-XACML/src/main/java/org/onap/policy/xacml/std/pap/StdEngine.java index ca2271ab4..d3dc7ae18 100644 --- a/ONAP-XACML/src/main/java/org/onap/policy/xacml/std/pap/StdEngine.java +++ b/ONAP-XACML/src/main/java/org/onap/policy/xacml/std/pap/StdEngine.java @@ -180,18 +180,8 @@ public class StdEngine extends StdPDPItemSetChangeNotifier implements PAPPolicyE // We don't have the default group, create it // String defaultId = properties.getProperty(PROP_PAP_GROUPS_DEFAULT, PROP_PAP_GROUPS_DEFAULT_NAME); - if(defaultId == null){ - defaultId = PROP_PAP_GROUPS_DEFAULT_NAME; - } - if("".equals(defaultId)){ - defaultId = PROP_PAP_GROUPS_DEFAULT_NAME; - } - //we're going to check one more time in case the PROP_PAP_GROUPS_DEFAULT_NAME doesn't exist - if(defaultId == null){ - defaultId = "default"; - } if("".equals(defaultId)){ - defaultId = "default"; + defaultId = PROP_PAP_GROUPS_DEFAULT_NAME; } logger.warn("Default group does NOT exist, creating " + defaultId); Path defaultPath = Paths.get(this.repository.toString(), defaultId); |