X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=cadi%2Faaf%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Faaf%2Fcadi%2Fregister%2FRegistrationCreator.java;h=f4e0a688f579c43780ba11ed65b7b216dd8f640e;hb=ba331a70f03bb5bf93fdb83a1ff221bdbf817749;hp=5221d8eacc141c2363ca86b99aec8baf8a49f963;hpb=ff1417ff60baee231a28272f9a16ef2c9c8ea0a2;p=aaf%2Fauthz.git

diff --git a/cadi/aaf/src/main/java/org/onap/aaf/cadi/register/RegistrationCreator.java b/cadi/aaf/src/main/java/org/onap/aaf/cadi/register/RegistrationCreator.java
index 5221d8ea..f4e0a688 100644
--- a/cadi/aaf/src/main/java/org/onap/aaf/cadi/register/RegistrationCreator.java
+++ b/cadi/aaf/src/main/java/org/onap/aaf/cadi/register/RegistrationCreator.java
@@ -99,7 +99,8 @@ public class RegistrationCreator {
     				if (protocol!=null) {
     					locate.setProtocol(protocol);
 						List<String> ls = locate.getSubprotocol();
-						if(ls==null || ls.isEmpty()) {
+						// ls cannot be null, per generated getSubprotocol code
+						if(ls.isEmpty()) {
 	    					String subprotocols = access.getProperty(Config.AAF_LOCATOR_SUBPROTOCOL + dot_le, null);
 	    					if(subprotocols==null) {
 	    						subprotocols = access.getProperty(Config.CADI_PROTOCOLS, null);