From: Instrumental <jonathan.gathman@att.com>
Date: Wed, 12 Sep 2018 19:32:46 +0000 (-0500)
Subject: fix FirstNSbyType
X-Git-Tag: 2.1.2~47
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F05%2F66205%2F1;p=aaf%2Fauthz.git

fix FirstNSbyType

Issue-ID: AAF-488
Change-Id: Ie20a7f6fa53068defa11c04492c41970888d2248
Signed-off-by: Instrumental <jonathan.gathman@att.com>
---

diff --git a/auth/auth-cass/src/main/java/org/onap/aaf/auth/dao/hl/Question.java b/auth/auth-cass/src/main/java/org/onap/aaf/auth/dao/hl/Question.java
index e63bc52a..43a88aa5 100644
--- a/auth/auth-cass/src/main/java/org/onap/aaf/auth/dao/hl/Question.java
+++ b/auth/auth-cass/src/main/java/org/onap/aaf/auth/dao/hl/Question.java
@@ -391,6 +391,14 @@ public class Question {
                 lookup = nsd.parent;
                 if (type.type == nsd.type) {
                     return Result.ok(nsd);
+                } else {
+                    int dot = str.lastIndexOf('.');
+	                
+	                if (dot < 0) {
+	                    return Result.err(Status.ERR_NsNotFound, "No Namespace for [%s]", str);
+	                } else {
+	                    return deriveFirstNsForType(trans, str.substring(0, dot),type);
+	                }
                 }
             } else {
                 return Result.err(Status.ERR_NsNotFound,"There is no valid Company Namespace for %s",str);