Merge "Keep only clean TestCases, remove 2 license issues"

[aaf/authz.git] / auth / auth-batch / src / main / java / org / onap / aaf / auth / Batch.java

diff --git a/auth/auth-batch/src/main/java/org/onap/aaf/auth/Batch.java b/auth/auth-batch/src/main/java/org/onap/aaf/auth/Batch.java
index 6d9252e..64c0971 100644 (file)
--- a/auth/auth-batch/src/main/java/org/onap/aaf/auth/Batch.java
+++ b/auth/auth-batch/src/main/java/org/onap/aaf/auth/Batch.java
@@ -49,9 +49,9 @@ import org.onap.aaf.auth.env.AuthzEnv;
 import org.onap.aaf.auth.env.AuthzTrans;
 import org.onap.aaf.auth.layer.Result;
 import org.onap.aaf.auth.org.Organization;
+import org.onap.aaf.auth.org.Organization.Identity;
 import org.onap.aaf.auth.org.OrganizationException;
 import org.onap.aaf.auth.org.OrganizationFactory;
-import org.onap.aaf.auth.org.Organization.Identity;
 import org.onap.aaf.cadi.PropAccess;
 import org.onap.aaf.misc.env.APIException;
 import org.onap.aaf.misc.env.Env;
@@ -369,11 +369,15 @@ public abstract class Batch {
        return ld;
     }
        protected int count(String str, char c) {
-               int count=str==null||str.isEmpty()?0:1;
-               for(int i=str.indexOf(c);i>=0;i=str.indexOf(c,i+1)) {
-                       ++count;
+               if(str==null || str.isEmpty()) {
+                       return 0;
+               } else {
+                       int count=1;
+                       for(int i=str.indexOf(c);i>=0;i=str.indexOf(c,i+1)) {
+                               ++count;
+                       }
+                       return count;
                }
-               return count;
        }
 
        public final void close(AuthzTrans trans) {