fix(host): avoid NPE if a JAXBException occurs on scanner execution

DropSnorz · Mar 31, 2023 · 9fcba8e · 9fcba8e
1 parent 993f373
commit 9fcba8e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/owlplug-client/src/main/java/com/owlplug/core/tasks/PluginSyncTask.java b/owlplug-client/src/main/java/com/owlplug/core/tasks/PluginSyncTask.java
@@ -166,7 +166,7 @@ protected TaskResult call() throws Exception {
         }
       }
 
-      log.debug(collectedPluginFiles.size() + " plugins collected");
+      log.info(collectedPluginFiles.size() + " plugins collected");
 
       //Save all discovered symlinks
       symlinkDAO.saveAll(collectedSymlinks);

diff --git a/owlplug-host/src/main/java/com/owlplug/host/loaders/EmbeddedScannerPluginLoader.java b/owlplug-host/src/main/java/com/owlplug/host/loaders/EmbeddedScannerPluginLoader.java
@@ -181,7 +181,9 @@ private List<NativePlugin> createPluginsFromCommandOutput(String output) {
           outputXML = outputXML.strip();
 
           JuceXMLPlugin plugin = createJucePluginFromRawXml(outputXML);
-          plugins.add(plugin.toNativePlugin());
+          if (plugin != null) {
+            plugins.add(plugin.toNativePlugin());
+          }
 
         } else {
           log.trace("No XML tag can be extracted from part {} for plugin", i);
@@ -209,7 +211,7 @@ private JuceXMLPlugin createJucePluginFromRawXml(String xml) {
 
     } catch (JAXBException e) {
       log.error("Error during XML mapping", e);
-      log.debug(xml);
+      log.error(xml);
       return null;
     }
   }