From 0bd4f9b56d399349b909060a7af4121559b99ccb Mon Sep 17 00:00:00 2001
From: Björn Hagemeister
Date: Wed, 1 Oct 2014 15:43:49 +0200
Subject: Completed exception handling (ThriftConnection) plus completed
 properties checks (Globals).

---
 src/main/java/org/openslx/satellitedaemon/Globals.java | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'src/main/java/org/openslx/satellitedaemon/Globals.java')

diff --git a/src/main/java/org/openslx/satellitedaemon/Globals.java b/src/main/java/org/openslx/satellitedaemon/Globals.java
index 2bb9f68..9ff6911 100644
--- a/src/main/java/org/openslx/satellitedaemon/Globals.java
+++ b/src/main/java/org/openslx/satellitedaemon/Globals.java
@@ -111,7 +111,14 @@ public class Globals {
 		keyFact = kf;
 		
 		notNullOrEmptyFatal(getMasterserverHost(), "Masterserver Host must not be empty!");
-		// TODO: check properties
+		notNullOrEmptyFatal(getKeystoreType(), "Keystore Type must not be empty");
+		notNullOrEmptyFatal(getFiletransferKeystorePassword(), "File transfer Keystore Password must not be empty!");
+		notNullOrEmptyFatal(getFiletransferKeystorePath(), "File transfer Keystore Path must not be empty!");
+		notNullOrEmptyFatal(getOrganizationName(), "Organiziation Name must not be empty!");
+		notNullOrEmptyFatal(getThriftKeystoreAlias(), "Thrift Keystore Alias must not be empty!");
+		notNullOrEmptyFatal(getThriftKeystorePassword(), "Thrift Keystore Password must not be empty!");
+		notNullOrEmptyFatal(getThriftKeystorePath(), "Thrift Keystore Path must not be empty!");
+		notNullOrEmptyFatal(getImageFolder(), "Image Folder must not be empty!");
 	}
 
 	/***********************************************************************************************/
-- 
cgit v1.2.3-55-g7522