From 4414f9a65b1b41088fa360ac51df53d79930e20a Mon Sep 17 00:00:00 2001
From: Nils Schwabe
Date: Fri, 4 Jul 2014 11:01:15 +0200
Subject: Fix that Globals are initialized before servers are starting up

Add serversocket.jks to .gitignore
---
 src/main/java/org/openslx/imagemaster/App.java     | 2 ++
 src/main/java/org/openslx/imagemaster/Globals.java | 3 +++
 2 files changed, 5 insertions(+)

(limited to 'src/main/java/org/openslx')

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" );
diff --git a/src/main/java/org/openslx/imagemaster/Globals.java b/src/main/java/org/openslx/imagemaster/Globals.java
index 6e5893e..3675d96 100644
--- a/src/main/java/org/openslx/imagemaster/Globals.java
+++ b/src/main/java/org/openslx/imagemaster/Globals.java
@@ -15,6 +15,8 @@ public class Globals
 	private static Logger log = Logger.getLogger( Globals.class );
 	private static final Properties properties = new Properties();
 	public final static int blockSize = 16 * 1024 * 1024;
+	
+	public static void init() {}
 
 	/**
 	 * Loads the properties from config/global.properties
@@ -75,6 +77,7 @@ public class Globals
 			log.warn( e.getStackTrace().toString() );
 			System.exit( 2 );
 		}
+		log.info( "Loaded properties successfully" );
 	}
 	
 	/* INTEGERS */
-- 
cgit v1.2.3-55-g7522