Fixes FS#230: Uncaught NullPointerException in DNSHelper

1 files changed, 5 insertions, 0 deletions

diff --git a/src/main/java/de/thedevstack/conversationsplus/utils/DNSHelper.java b/src/main/java/de/thedevstack/conversationsplus/utils/DNSHelper.java
index 90618292..a0fd9995 100644
--- a/src/main/java/de/thedevstack/conversationsplus/utils/DNSHelper.java
+++ b/src/main/java/de/thedevstack/conversationsplus/utils/DNSHelper.java
@@ -135,6 +135,7 @@ public class DNSHelper {
         Logging.d("dns", "using dns server: " + dnsServerHostAddress + " to look up " + qname);
         try {
             DNSMessage message = client.query(qname, TYPE.SRV, CLASS.IN, dnsServerHostAddress);
+            if (null != message) {
                 Record[] rrset = message.getAnswers();
                 for (Record rr : rrset) {
                     Data d = rr.getPayload();
@@ -144,6 +145,10 @@ public class DNSHelper {
                         result.add(srvRecord);
                     }
                 }
+            } else {
+                Logging.e("dns", "No valid DNS message retrieved.");
+            }
+
         } catch (IOException e) {
             Logging.d("dns", "Error while retrieving SRV record '" + qname + "' for '" + host + "' from DNS '" + dnsServerHostAddress + "': " + e.getMessage());
         }