Merge "System dependent separators"

[aaf/authz.git] / auth / auth-service / src / main / java / org / onap / aaf / auth / service / validation / ServiceValidator.java

diff --git a/auth/auth-service/src/main/java/org/onap/aaf/auth/service/validation/ServiceValidator.java b/auth/auth-service/src/main/java/org/onap/aaf/auth/service/validation/ServiceValidator.java
index a6bbbb0..80b06a5 100644 (file)
--- a/auth/auth-service/src/main/java/org/onap/aaf/auth/service/validation/ServiceValidator.java
+++ b/auth/auth-service/src/main/java/org/onap/aaf/auth/service/validation/ServiceValidator.java
@@ -141,11 +141,8 @@ public class ServiceValidator extends Validator {
                if(cd==null) {
                        msg("Cred Data is null.");
                } else {
-                       if(nob(cd.id,ID_CHARS)) {
-                               msg("ID [" + cd.id + "] is invalid in " + org.getName());
-                       }
                        if(!org.isValidCred(trans, cd.id)) {
-                               msg("ID [" + cd.id + "] is invalid for a cred in " + org.getName());
+                               msg("ID [" + cd.id + "] is invalid in " + org.getName());
                        }
                        String str = cd.id;
                        int idx = str.indexOf('@');
@@ -154,7 +151,8 @@ public class ServiceValidator extends Validator {
                        }
                        
                        if(org.supportsRealm(cd.id)) {
-                               if(isNew && (str=org.isValidID(trans, str)).length()>0) {
+                               String resp = org.isValidID(trans, str);
+                               if(isNew && (resp!=null && resp.length()>0)) {
                                        msg(cd.id,str);
                                }
                        }