From 6d3fe8e9d0da69bfbc9508a37ff7e0f92600d001 Mon Sep 17 00:00:00 2001
From: Sebastian Sdorra <sebastian.sdorra@cloudogu.com>
Date: Sun, 18 May 2014 10:20:54 +0200
Subject: [PATCH] fix npe on non daemon start

---
 scm-server/src/main/java/sonia/scm/server/ScmServer.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scm-server/src/main/java/sonia/scm/server/ScmServer.java b/scm-server/src/main/java/sonia/scm/server/ScmServer.java
index 13da881679..507e12a37f 100644
--- a/scm-server/src/main/java/sonia/scm/server/ScmServer.java
+++ b/scm-server/src/main/java/sonia/scm/server/ScmServer.java
@@ -94,10 +94,10 @@ public class ScmServer extends Thread
     {
       if (!initialized)
       {
-        server.join();
+        init();
       }
 
-      server.start();
+      server.join();
     }
     catch (Exception ex)
     {