make code null safe on shutdown (jupnp#102)

Signed-off-by: Kai Kreuzer <[email protected]>
Phexon21 · Jun 26, 2018 · 53a4da0 · 53a4da0
1 parent e0cea28
commit 53a4da0
Showing 1 changed file with 10 additions and 3 deletions.
diff --git a/bundles/org.jupnp/src/main/java/org/jupnp/protocol/async/ReceivingSearchResponse.java b/bundles/org.jupnp/src/main/java/org/jupnp/protocol/async/ReceivingSearchResponse.java
@@ -14,7 +14,10 @@
 
 package org.jupnp.protocol.async;
 
+import java.util.concurrent.Executor;
+
 import org.jupnp.UpnpService;
+import org.jupnp.UpnpServiceConfiguration;
 import org.jupnp.model.ValidationError;
 import org.jupnp.model.ValidationException;
 import org.jupnp.model.message.IncomingDatagramMessage;
@@ -98,9 +101,13 @@ protected void execute() throws RouterException {
             return;
         }
 
-        getUpnpService().getConfiguration().getAsyncProtocolExecutor()
-                .execute(new RetrieveRemoteDescriptors(getUpnpService(), rd));
-
+        UpnpServiceConfiguration conf = getUpnpService().getConfiguration();
+        if (conf != null) {
+            Executor executor = conf.getAsyncProtocolExecutor();
+            if (executor != null) {
+                executor.execute(new RetrieveRemoteDescriptors(getUpnpService(), rd));
+            }
+        }
     }
 
 }