1 files changed, 8 insertions, 6 deletions
diff --git a/cadi/client/src/main/java/org/onap/aaf/cadi/locator/DNSLocator.java b/cadi/client/src/main/java/org/onap/aaf/cadi/locator/DNSLocator.java
index 53782b34..f6edfd1d 100644
--- a/cadi/client/src/main/java/org/onap/aaf/cadi/locator/DNSLocator.java
+++ b/cadi/client/src/main/java/org/onap/aaf/cadi/locator/DNSLocator.java
@@ -103,10 +103,12 @@ public class DNSLocator implements SizedLocator<URI> {
 
     @Override
     public boolean hasItems() {
-        for (Host h : hosts) {
+        if(hosts!=null) {
+          for (Host h : hosts) {
             if (h.status==Status.OK) {
                 return true;
             }
+          }
         }
         return false;
     }
@@ -239,11 +241,11 @@ public class DNSLocator implements SizedLocator<URI> {
      *
      */
     public interface DNSLookup {
-    	InetAddress[] getAllByName(String host) throws UnknownHostException;
-    	public static final DNSLookup dflt = new DNSLookup() {
-    		public InetAddress[] getAllByName(String host) throws UnknownHostException {
-    			return InetAddress.getAllByName(host);
-    		}
+        InetAddress[] getAllByName(String host) throws UnknownHostException;
+        public static final DNSLookup dflt = new DNSLookup() {
+        public InetAddress[] getAllByName(String host) throws UnknownHostException {
+        return InetAddress.getAllByName(host);
+        }
     	};
     }