Merge pull request #87 from FRosner/issue/43

#43 catch possible error when creating an instance
FRosner · Sep 25, 2016 · 671fe2d · 671fe2d
2 parents a6f8024 + f7f79de
commit 671fe2d
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/app/de/frosner/broccoli/services/InstanceService.scala b/app/de/frosner/broccoli/services/InstanceService.scala
@@ -127,10 +127,12 @@ class InstanceService @Inject()(templateService: TemplateService,
       } else {
         val potentialTemplate = templateService.template(templateId)
         potentialTemplate.map { template =>
-          val newInstance = Instance(id, template, instanceCreation.parameters, InstanceStatus.Stopped, Map.empty)
-          instances = instances.updated(id, newInstance)
-          InstanceService.persistInstances(instances, new FileOutputStream(instancesFile))
-          Success(newInstance)
+          val maybeNewInstance = Try(Instance(id, template, instanceCreation.parameters, InstanceStatus.Stopped, Map.empty))
+          maybeNewInstance.map { newInstance =>
+            instances = instances.updated(id, newInstance)
+            InstanceService.persistInstances(instances, new FileOutputStream(instancesFile))
+            newInstance
+          }
         }.getOrElse(Failure(newExceptionWithWarning(new IllegalArgumentException(s"Template $templateId does not exist."))))
       }
     }.getOrElse(Failure(newExceptionWithWarning(new IllegalArgumentException("No ID specified"))))