Merge remote-tracking branch 'origin/master'

Evolveum · Nov 2, 2017 · 11c0890 · 11c0890
2 parents 55f2c28 + f50be11
commit 11c0890
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/boot/LdapSecurityConfig.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/boot/LdapSecurityConfig.java
@@ -42,7 +42,7 @@ public class LdapSecurityConfig {
     @Value("${auth.ldap.host}")
     private String ldapHost;
 
-    @Value("${auth.ldap.manager:#{null}}")
+    @Value("${auth.ldap.manager:}")
     private String ldapUserDn;
     @Value("${auth.ldap.password:#{null}}")
     private String ldapUserPassword;