X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=cadi%2Fcore%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Faaf%2Fcadi%2Ftaf%2FLoginPageTafResp.java;fp=cadi%2Fcore%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Faaf%2Fcadi%2Ftaf%2FLoginPageTafResp.java;h=3f80170ee41f1e009c1515cac20f888bae921822;hb=799f1236dceea6234561f39f73a317f8d93d71e6;hp=9c9cbc22ebfa620ac28ff086efe636d772a50a33;hpb=40a9c869994113c1d0701d205829c60837fe3e8b;p=aaf%2Fauthz.git

diff --git a/cadi/core/src/main/java/org/onap/aaf/cadi/taf/LoginPageTafResp.java b/cadi/core/src/main/java/org/onap/aaf/cadi/taf/LoginPageTafResp.java
index 9c9cbc22..3f80170e 100644
--- a/cadi/core/src/main/java/org/onap/aaf/cadi/taf/LoginPageTafResp.java
+++ b/cadi/core/src/main/java/org/onap/aaf/cadi/taf/LoginPageTafResp.java
@@ -53,34 +53,42 @@ public class LoginPageTafResp extends AbsTafResp {
 		return RESP.TRY_AUTHENTICATING;
 	}
 	
-	public static TafResp create(Access access, Locator<URI> locator, final HttpServletResponse resp, List<Redirectable> redir) {
-		if(locator!=null) {
-			try {
-				Item item = locator.best();
-				URI uri = locator.get(item);
-				if(uri!=null) {
-					StringBuilder sb = new StringBuilder(uri.toString());
-					String query = uri.getQuery();
-					boolean first = query==null || query.length()==0;
-					int count=0;
-					for(Redirectable t : redir) {
-						if(first) {
-							sb.append('?');
-							first=false;
-						}
-						else sb.append('&');
-						sb.append(t.get());
-						++count;
-					}
-					if(count>0)return new LoginPageTafResp(access, resp, sb.toString());
+	public static TafResp create(Access access, Locator<URI> locator, final HttpServletResponse resp, List<Redirectable> redirectables) {
+		if (locator == null) {
+			if (!redirectables.isEmpty()) { 
+				access.log(Level.DEBUG,"LoginPage Locator is not configured. Taking first Redirectable Taf");
+				return redirectables.get(0);
+			}
+			return NullTafResp.singleton();
+		}
+
+		try {
+			Item item = locator.best();
+			URI uri = locator.get(item);
+			if (uri == null) {
+				return NullTafResp.singleton();
+			}
+
+			StringBuilder sb = new StringBuilder(uri.toString());
+			String query = uri.getQuery();
+			boolean first = ((query == null) || (query.length() == 0));
+			for (Redirectable redir : redirectables) {
+				if (first) {
+					sb.append('?');
+					first = false;
+				}
+				else {
+					sb.append('&');
 				}
-			} catch (Exception e) {
-				access.log(e, "Error deriving Login Page location");
+				sb.append(redir.get());
 			}
-		} else if(!redir.isEmpty()) { 
-			access.log(Level.DEBUG,"LoginPage Locator is not configured. Taking first Redirectable Taf");
-			return redir.get(0);
+			if (!redirectables.isEmpty()) {
+				return new LoginPageTafResp(access, resp, sb.toString());
+			}
+		} catch (Exception e) {
+			access.log(e, "Error deriving Login Page location");
 		}
+
 		return NullTafResp.singleton();
 	}
 }