From 68f18bf7faee11e2cc8aa7da8049cc35b78e1ba6 Mon Sep 17 00:00:00 2001
From: srosse <stephane.rosse@frentix.com>
Date: Thu, 25 Apr 2019 11:29:14 +0200
Subject: [PATCH] OO-4023: fix rs during cloning of course configuration

---
 .../org/olat/course/config/CourseConfig.java   | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/olat/course/config/CourseConfig.java b/src/main/java/org/olat/course/config/CourseConfig.java
index d72f67da27e..bb14583ccad 100644
--- a/src/main/java/org/olat/course/config/CourseConfig.java
+++ b/src/main/java/org/olat/course/config/CourseConfig.java
@@ -477,7 +477,11 @@ public class CourseConfig implements Serializable, Cloneable {
 	}
 	
 	public void setCertificateCustom1(String custom1) {
-		configuration.put(CERTIFICATE_CUSTOM1, custom1);
+		if(custom1 != null) {
+			configuration.put(CERTIFICATE_CUSTOM1, custom1);
+		} else {
+			configuration.remove(CERTIFICATE_CUSTOM1);
+		}
 	}
 	
 	public String getCertificateCustom2() {
@@ -485,7 +489,11 @@ public class CourseConfig implements Serializable, Cloneable {
 	}
 	
 	public void setCertificateCustom2(String custom2) {
-		configuration.put(CERTIFICATE_CUSTOM2, custom2);
+		if(custom2 != null) {
+			configuration.put(CERTIFICATE_CUSTOM2, custom2);
+		} else {
+			configuration.remove(CERTIFICATE_CUSTOM2);
+		}
 	}
 	
 	public String getCertificateCustom3() {
@@ -493,7 +501,11 @@ public class CourseConfig implements Serializable, Cloneable {
 	}
 	
 	public void setCertificateCustom3(String custom3) {
-		configuration.put(CERTIFICATE_CUSTOM3, custom3);
+		if(custom3 != null) {
+			configuration.put(CERTIFICATE_CUSTOM3, custom3);
+		} else {
+			configuration.remove(CERTIFICATE_CUSTOM3);
+		}
 	}
 	
 	/**
-- 
GitLab