diff options
Diffstat (limited to 'auth/auth-core')
| -rw-r--r-- | auth/auth-core/pom.xml | 18 | ||||
| -rw-r--r-- | auth/auth-core/src/main/java/org/onap/aaf/auth/org/OrganizationFactory.java | 6 |
2 files changed, 4 insertions, 20 deletions
diff --git a/auth/auth-core/pom.xml b/auth/auth-core/pom.xml index 91517836..5409a327 100644 --- a/auth/auth-core/pom.xml +++ b/auth/auth-core/pom.xml @@ -25,7 +25,7 @@ <parent> <groupId>org.onap.aaf.authz</groupId> <artifactId>authparent</artifactId> - <version>2.1.16-SNAPSHOT</version> + <version>2.1.17-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> @@ -45,22 +45,6 @@ </roles> </developer> <developer> - <name>Gabe Maurer</name> - <email>gabe.maurer@att.com</email> - <organization>ATT</organization> - <roles> - <role>Developer</role> - </roles> - </developer> - <developer> - <name>Ian Howell</name> - <email>ian.howell@att.com</email> - <organization>ATT</organization> - <roles> - <role>Developer</role> - </roles> - </developer> - <developer> <name>Sai Gandham</name> <email>sai.gandham@att.com</email> <organization>ATT</organization> diff --git a/auth/auth-core/src/main/java/org/onap/aaf/auth/org/OrganizationFactory.java b/auth/auth-core/src/main/java/org/onap/aaf/auth/org/OrganizationFactory.java index 867d2984..6d559de5 100644 --- a/auth/auth-core/src/main/java/org/onap/aaf/auth/org/OrganizationFactory.java +++ b/auth/auth-core/src/main/java/org/onap/aaf/auth/org/OrganizationFactory.java @@ -131,13 +131,13 @@ public class OrganizationFactory { } env.init().printf("Instantiated %s with %s%s",orgNS,orgClass,(isDefault?" as default":"")); } - if (org==null) { - if (defaultOrg!=null) { + if ( (org==null) && (defaultOrg!=null)){ + org=defaultOrg; orgs.put(orgNS, org); } } - } + return org; } |