From a9d3788e24706bd200b831ffc35643ddfe687163 Mon Sep 17 00:00:00 2001
From: srosse <none@none>
Date: Mon, 6 Jun 2016 16:45:24 +0200
Subject: [PATCH] OO-2048: fix autoboxing of boolean value which can be null
---
src/main/java/org/olat/course/nodes/ta/DropboxForm.java | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/olat/course/nodes/ta/DropboxForm.java b/src/main/java/org/olat/course/nodes/ta/DropboxForm.java
index fde66bcbb94..2a2cccd5dda 100644
--- a/src/main/java/org/olat/course/nodes/ta/DropboxForm.java
+++ b/src/main/java/org/olat/course/nodes/ta/DropboxForm.java
@@ -77,7 +77,8 @@ public class DropboxForm extends FormBasicController {
protected void formOK(UserRequest ureq) {
fireEvent (ureq, Event.DONE_EVENT);
}
-
+
+ @Override
protected void formInnerEvent (UserRequest ureq, FormItem source, FormEvent event) {
if (source == enablemail) {
confirmation.setMandatory (enablemail.isSelected(0));
@@ -112,7 +113,9 @@ public class DropboxForm extends FormBasicController {
confirmation = uifactory.addTextAreaElement("confirmation", "form.dropbox.confirmation", 2500, 4, 40, true, sConfirmation != null ? sConfirmation : "", formLayout);
Boolean enableMail = (Boolean)config.get(TACourseNode.CONF_DROPBOX_ENABLEMAIL);
- confirmation.setMandatory(enableMail);
+ if(enableMail != null) {
+ confirmation.setMandatory(enableMail.booleanValue());
+ }
enablemail = uifactory.addCheckboxesHorizontal("enablemail", "form.dropbox.enablemail", formLayout, new String[]{"xx"}, new String[]{null});
enablemail.select("xx", enableMail != null ? enableMail.booleanValue() : true);
enablemail.addActionListener(FormEvent.ONCLICK);
--
GitLab