diff options
Diffstat (limited to 'src/main/java/org/openslx/imagemaster/Globals.java')
| -rw-r--r-- | src/main/java/org/openslx/imagemaster/Globals.java | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/src/main/java/org/openslx/imagemaster/Globals.java b/src/main/java/org/openslx/imagemaster/Globals.java index 653e255..7dbbae4 100644 --- a/src/main/java/org/openslx/imagemaster/Globals.java +++ b/src/main/java/org/openslx/imagemaster/Globals.java @@ -22,14 +22,22 @@ public class Globals { public static final String ldapSearchFilter = "ldap_search_filter"; public static boolean propertiesValid() { - if (Globals.properties.getProperty(ftpBaseDir).isEmpty() + if (Globals.properties.getProperty(ftpBaseDir) == null + || Globals.properties.getProperty(ftpBaseDir).isEmpty() + || Globals.properties.getProperty(imageDir) == null || Globals.properties.getProperty(imageDir).isEmpty() + || Globals.properties.getProperty(ldapPort) == null || Globals.properties.getProperty(ldapPort).isEmpty() + || Globals.properties.getProperty(ldapHost) == null || Globals.properties.getProperty(ldapHost).isEmpty() + || Globals.properties.getProperty(ldapSsl) == null || Globals.properties.getProperty(ldapSsl).isEmpty() + || Globals.properties.getProperty(ldapBindQuery) == null || Globals.properties.getProperty(ldapBindQuery).isEmpty() + || Globals.properties.getProperty(ldapSearchBaseDn) == null || Globals.properties.getProperty(ldapSearchBaseDn).isEmpty() - || Globals.properties.getProperty(ldapSearchBaseDn).isEmpty() + || Globals.properties.getProperty(ldapSearchFilter) == null + || Globals.properties.getProperty(ldapSearchFilter).isEmpty() ) { return false; } |