From 5653c19898d37766b0057805592e27022150e4c8 Mon Sep 17 00:00:00 2001
From: To-om <toom@thehive-project.org>
Date: Sun, 7 May 2017 13:52:56 +0200
Subject: [PATCH] #21 Make baseConfig optional

---
 app/services/ExternalAnalyzerSrv.scala | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/services/ExternalAnalyzerSrv.scala b/app/services/ExternalAnalyzerSrv.scala
index ae1927e69..7bdf23063 100644
--- a/app/services/ExternalAnalyzerSrv.scala
+++ b/app/services/ExternalAnalyzerSrv.scala
@@ -128,8 +128,10 @@ class ExternalAnalyzerSrv(
       command ← (__ \ "command").read[String]
       absoluteCommand = analyzerPath.resolve(Paths.get(command.replaceAll("[\\/]", File.separator)))
       config ← (__ \ "config").read[JsObject]
-      baseConfigKey ← (__ \ "baseConfig").read[String]
-      baseConfig = (analyzerConfig \ baseConfigKey).asOpt[JsObject].getOrElse(JsObject(Nil))
+      baseConfigKey ← (__ \ "baseConfig").readNullable[String]
+      baseConfig = baseConfigKey
+        .flatMap(bc ⇒ (analyzerConfig \ bc).asOpt[JsObject])
+        .getOrElse(Json.obj())
     } yield ExternalAnalyzer(
       name,
       version,