From 21daa3af71fe6dbb20edc63a387c0c6e4c8318ee Mon Sep 17 00:00:00 2001 From: pastith Date: Wed, 1 Apr 2009 13:42:20 +0000 Subject: [PATCH 1/1] Treat empty attribute strings as missing attributes. --- gss/src/gr/ebs/gss/server/Login.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gss/src/gr/ebs/gss/server/Login.java b/gss/src/gr/ebs/gss/server/Login.java index ab69f94..021becf 100644 --- a/gss/src/gr/ebs/gss/server/Login.java +++ b/gss/src/gr/ebs/gss/server/Login.java @@ -149,13 +149,13 @@ public class Login extends HttpServlet { } String username = usernameAttr.toString(); String name; - if (nameAttr != null) + if (nameAttr != null && !nameAttr.toString().isEmpty()) name = nameAttr.toString(); - else if (cnAttr != null) + else if (cnAttr != null && !cnAttr.toString().isEmpty()) name = cnAttr.toString(); - else if (givennameAttr != null && snAttr != null) + else if (givennameAttr != null && snAttr != null && !givennameAttr.toString().isEmpty() && !snAttr.toString().isEmpty()) name = givennameAttr.toString() + ' ' + snAttr.toString(); - else if (givennameAttr == null && snAttr != null) + else if (givennameAttr == null && snAttr != null && !snAttr.toString().isEmpty()) name = snAttr.toString(); else name = username; -- 1.7.10.4