summaryrefslogtreecommitdiffstats
path: root/src/main/java/org/openslx/satellitedaemon/Globals.java
diff options
context:
space:
mode:
authorBjörn Hagemeister2014-10-01 15:43:49 +0200
committerBjörn Hagemeister2014-10-01 15:43:49 +0200
commit0bd4f9b56d399349b909060a7af4121559b99ccb (patch)
tree5320d53a0777f3efb3dcfc56105cfb53d8a87713 /src/main/java/org/openslx/satellitedaemon/Globals.java
parentRemoved unneseccary try - catch - blocks. (diff)
downloadsatellite-daemon-0bd4f9b56d399349b909060a7af4121559b99ccb.tar.gz
satellite-daemon-0bd4f9b56d399349b909060a7af4121559b99ccb.tar.xz
satellite-daemon-0bd4f9b56d399349b909060a7af4121559b99ccb.zip
Completed exception handling (ThriftConnection) plus completed properties checks (Globals).
Diffstat (limited to 'src/main/java/org/openslx/satellitedaemon/Globals.java')
-rw-r--r--src/main/java/org/openslx/satellitedaemon/Globals.java9
1 files changed, 8 insertions, 1 deletions
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!");
}
/***********************************************************************************************/