From 5d63ebab603773a9dfe1fb6e8f683b7d783cdfb2 Mon Sep 17 00:00:00 2001
From: Kai Reinhard <K.Reinhard@micromata.de>
Date: Fri, 21 Dec 2018 23:29:16 +0000
Subject: [PATCH] Avoid NPE on shutdown, if server was not started.

---
 borgbutler-server/src/main/java/de/micromata/borgbutler/server/Main.java |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/borgbutler-server/src/main/java/de/micromata/borgbutler/server/Main.java b/borgbutler-server/src/main/java/de/micromata/borgbutler/server/Main.java
index 88d2829..07f1b63 100644
--- a/borgbutler-server/src/main/java/de/micromata/borgbutler/server/Main.java
+++ b/borgbutler-server/src/main/java/de/micromata/borgbutler/server/Main.java
@@ -116,6 +116,10 @@
     }
 
     private void _shutdown() {
+        if (server == null) {
+            // Do nothing (server wasn't started).
+            return;
+        }
         synchronized (this) {
             if (shutdownInProgress == true) {
                 // Another thread already called this method. There is nothing further to do.

--
Gitblit v1.10.0