Fixed potential NPE https://github.com/qivicon/jupnp/commit/fa4b0cc1e…

…44a06206c6c4f67d661724685097c80
4thline · Nov 5, 2014 · a0bc7c3 · a0bc7c3
1 parent 04de9e7
commit a0bc7c3
Showing 1 changed file with 7 additions and 7 deletions.
diff --git a/core/src/main/java/org/fourthline/cling/protocol/RetrieveRemoteDescriptors.java b/core/src/main/java/org/fourthline/cling/protocol/RetrieveRemoteDescriptors.java
@@ -217,15 +217,15 @@ protected void describe(String descriptorXML) throws RouterException {
                             new DescriptorBindingException("Device service description failed: " + rd)
                     );
                 return;
+            } else {
+                log.fine("Adding fully hydrated remote device to registry: " + hydratedDevice);
+                // The registry will do the right thing: A new root device is going to be added, if it's
+                // already present or we just received the descriptor again (because we got an embedded
+                // devices' notification), it will simply update the expiration timestamp of the root
+                // device.
+                getUpnpService().getRegistry().addDevice(hydratedDevice);
             }
 
-            log.fine("Adding fully hydrated remote device to registry: " + hydratedDevice);
-            // The registry will do the right thing: A new root device is going to be added, if it's
-            // already present or we just received the descriptor again (because we got an embedded
-            // devices' notification), it will simply update the expiration timestamp of the root
-            // device.
-            getUpnpService().getRegistry().addDevice(hydratedDevice);
-
         } catch (ValidationException ex) {
     		// Avoid error log spam each time device is discovered, errors are logged once per device.
         	if(!errorsAlreadyLogged.contains(rd.getIdentity().getUdn())) {