X-Git-Url: https://gerrit.onap.org/r/gitweb?p=aaf%2Fauthz.git;a=blobdiff_plain;f=auth%2Fauth-deforg%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Faaf%2Forg%2FDefaultOrgIdentity.java;fp=auth%2Fauth-deforg%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Faaf%2Forg%2FDefaultOrgIdentity.java;h=eaa4483054b6e9375f2351cfe223638970cf82f7;hp=f1576c4fe6692c7c5ee2f0d56c2aab5c9493375c;hb=be1edcb6830745015f5de72e820f40f36dd571ad;hpb=165e298554f06ecd0545df604e11736ebf71566d

diff --git a/auth/auth-deforg/src/main/java/org/onap/aaf/org/DefaultOrgIdentity.java b/auth/auth-deforg/src/main/java/org/onap/aaf/org/DefaultOrgIdentity.java
index f1576c4f..eaa44830 100644
--- a/auth/auth-deforg/src/main/java/org/onap/aaf/org/DefaultOrgIdentity.java
+++ b/auth/auth-deforg/src/main/java/org/onap/aaf/org/DefaultOrgIdentity.java
@@ -120,10 +120,14 @@ public class DefaultOrgIdentity implements Identity {
 
     @Override
     public Identity responsibleTo() throws OrganizationException {
-        if ("".equals(identity.responsibleTo) && isFound()) { // cover the situation of Top Dog... reports to no-one.
-            return this;
+    	if(isFound()) {
+	        if ("".equals(identity.responsibleTo)) { // cover the situation of Top Dog... reports to no-one.
+	            return this;
+	        } else {
+	            return org.getIdentity(trans, identity.responsibleTo);
+	        }
         } else {
-            return org.getIdentity(trans, identity.responsibleTo);
+        	throw new OrganizationException("Identity doesn't exist");
         }
     }