summaryrefslogtreecommitdiffstats
path: root/src/main/java/org/openslx/imagemaster/App.java
diff options
context:
space:
mode:
authorNils Schwabe2014-07-04 11:01:15 +0200
committerNils Schwabe2014-07-04 11:01:15 +0200
commit4414f9a65b1b41088fa360ac51df53d79930e20a (patch)
tree99095acd9d15dacb8cf7f24f60ddc4e235813063 /src/main/java/org/openslx/imagemaster/App.java
parentChange loading and checking of properties (diff)
downloadmasterserver-4414f9a65b1b41088fa360ac51df53d79930e20a.tar.gz
masterserver-4414f9a65b1b41088fa360ac51df53d79930e20a.tar.xz
masterserver-4414f9a65b1b41088fa360ac51df53d79930e20a.zip
Fix that Globals are initialized before servers are starting up
Add serversocket.jks to .gitignore
Diffstat (limited to 'src/main/java/org/openslx/imagemaster/App.java')
-rw-r--r--src/main/java/org/openslx/imagemaster/App.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/main/java/org/openslx/imagemaster/App.java b/src/main/java/org/openslx/imagemaster/App.java
index 4a4baf0..68c188f 100644
--- a/src/main/java/org/openslx/imagemaster/App.java
+++ b/src/main/java/org/openslx/imagemaster/App.java
@@ -26,6 +26,8 @@ public class App
// Init logging
log.info( "Starting Application" );
+ Globals.init();
+
// Create binary listener
Thread t;
t = new Thread( new BinaryListener(), "BinaryListener" );