From 90fae6c79900f0152a2a3ae7a92c034eb7df47c5 Mon Sep 17 00:00:00 2001
From: srosse <stephane.rosse@frentix.com>
Date: Tue, 8 Sep 2020 09:06:34 +0200
Subject: [PATCH] OO-4771: - is used as null for the life cycle preferences
---
src/main/java/org/olat/repository/RepositoryModule.java | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/main/java/org/olat/repository/RepositoryModule.java b/src/main/java/org/olat/repository/RepositoryModule.java
index d483938dc1e..b8b83cca8a7 100644
--- a/src/main/java/org/olat/repository/RepositoryModule.java
+++ b/src/main/java/org/olat/repository/RepositoryModule.java
@@ -355,7 +355,7 @@ public class RepositoryModule extends AbstractSpringModule {
try {
return RepositoryEntryAllowToLeaveOptions.valueOf(defaultAllowToLeaveOption);
} catch (Exception e) {
- log.error("Unrecognised option for repo.allow.to.leave: " + defaultAllowToLeaveOption);
+ log.error("Unrecognised option for repo.allow.to.leave: {}", defaultAllowToLeaveOption);
return RepositoryEntryAllowToLeaveOptions.atAnyTime;
}
}
@@ -373,7 +373,7 @@ public class RepositoryModule extends AbstractSpringModule {
}
public String getLifecycleAutoClose() {
- return lifecycleAutoClose;
+ return "-".equals(lifecycleAutoClose) ? null : lifecycleAutoClose;
}
public RepositoryEntryLifeCycleValue getLifecycleAutoCloseValue() {
@@ -386,7 +386,7 @@ public class RepositoryModule extends AbstractSpringModule {
}
public String getLifecycleAutoDelete() {
- return lifecycleAutoDelete;
+ return "-".equals(lifecycleAutoDelete) ? null : lifecycleAutoDelete;
}
public RepositoryEntryLifeCycleValue getLifecycleAutoDeleteValue() {
@@ -399,7 +399,7 @@ public class RepositoryModule extends AbstractSpringModule {
}
public String getLifecycleAutoDefinitivelyDelete() {
- return lifecycleAutoDefinitivelyDelete;
+ return "-".equals(lifecycleAutoDefinitivelyDelete) ? null : lifecycleAutoDefinitivelyDelete;
}
public RepositoryEntryLifeCycleValue getLifecycleAutoDefinitivelyDeleteValue() {
--
GitLab