1 files changed, 5 insertions, 18 deletions
diff --git a/src/main/java/org/openslx/imagemaster/App.java b/src/main/java/org/openslx/imagemaster/App.java
index 8d7f200..c0f7a34 100644
--- a/src/main/java/org/openslx/imagemaster/App.java
+++ b/src/main/java/org/openslx/imagemaster/App.java
@@ -1,12 +1,11 @@
 package org.openslx.imagemaster;
 
-import java.io.BufferedInputStream;
-import java.io.FileInputStream;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 
 import org.apache.log4j.Logger;
+import org.openslx.imagemaster.Globals.PropInt;
 import org.openslx.imagemaster.server.FtpCredentialsScheduler;
 import org.openslx.imagemaster.thrift.server.BinaryListener;
 
@@ -20,30 +19,17 @@ public class App {
 		log.info("Starting Application");
 
 		// Load properties
-		boolean error = false;
-		BufferedInputStream stream = null;
 		try {
-			stream = new BufferedInputStream(new FileInputStream(
-					"config/global.properties"));
-			Globals.properties.load(stream);
+			Globals.loadProperties(); // don't need to check return, because this should be the first time where props are loaded.
 			if (!Globals.propertiesValid()) {
 				log.error("Config file contains errors.");
 				System.exit(1);
 			}
 		} catch (IOException e) {
 			log.error("Could not load config file. Quitting.");
-			error = true;
-		} finally {
-			if (stream != null) {
-				try {
-					stream.close();
-				} catch (IOException e) {
-				}
-			}
-			if (error)
-				System.exit(1);
-			log.info("Loaded config file");
+			System.exit(1);
 		}
+		log.info("Loaded config file");
 
 		// Create binary listener
 		Thread t;
@@ -52,6 +38,7 @@ public class App {
 		t.start();
 
 		// Create Ftp Server
+		Globals.ftpServer.init( Globals.getPropertyInt( PropInt.FTPPORT ) );
 		Thread f;
 		f = new Thread(Globals.ftpServer, "FtpServer");
 		servers.add(f);