Merge branch 'master' of github.com:Evolveum/midpoint

Evolveum · May 18, 2014 · abad73d · abad73d
2 parents c7a455c + 29cd6e0
commit abad73d
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/.../com/evolveum/midpoint/web/page/admin/configuration/dto/NotificationConfigurationDto.java b/.../com/evolveum/midpoint/web/page/admin/configuration/dto/NotificationConfigurationDto.java
@@ -48,7 +48,14 @@ public NotificationConfigurationDto(NotificationConfigurationType config){
             MailConfigurationType mailConfig = config.getMail();
 
             defaultFrom = mailConfig.getDefaultFrom();
-            debug = mailConfig.isDebug();
+
+            if(mailConfig.isDebug() != null){
+                debug = mailConfig.isDebug();
+            } else {
+                debug = false;
+            }
+
+
             redirectToFile = mailConfig.getRedirectToFile();
 
             if(!mailConfig.getServer().isEmpty() && mailConfig.getServer().get(0) != null){