Skip to content
Snippets Groups Projects
Commit 90fae6c7 authored by srosse's avatar srosse
Browse files

OO-4771: - is used as null for the life cycle preferences

parent b7792e81
No related branches found
No related tags found
No related merge requests found
...@@ -355,7 +355,7 @@ public class RepositoryModule extends AbstractSpringModule { ...@@ -355,7 +355,7 @@ public class RepositoryModule extends AbstractSpringModule {
try { try {
return RepositoryEntryAllowToLeaveOptions.valueOf(defaultAllowToLeaveOption); return RepositoryEntryAllowToLeaveOptions.valueOf(defaultAllowToLeaveOption);
} catch (Exception e) { } 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; return RepositoryEntryAllowToLeaveOptions.atAnyTime;
} }
} }
...@@ -373,7 +373,7 @@ public class RepositoryModule extends AbstractSpringModule { ...@@ -373,7 +373,7 @@ public class RepositoryModule extends AbstractSpringModule {
} }
public String getLifecycleAutoClose() { public String getLifecycleAutoClose() {
return lifecycleAutoClose; return "-".equals(lifecycleAutoClose) ? null : lifecycleAutoClose;
} }
public RepositoryEntryLifeCycleValue getLifecycleAutoCloseValue() { public RepositoryEntryLifeCycleValue getLifecycleAutoCloseValue() {
...@@ -386,7 +386,7 @@ public class RepositoryModule extends AbstractSpringModule { ...@@ -386,7 +386,7 @@ public class RepositoryModule extends AbstractSpringModule {
} }
public String getLifecycleAutoDelete() { public String getLifecycleAutoDelete() {
return lifecycleAutoDelete; return "-".equals(lifecycleAutoDelete) ? null : lifecycleAutoDelete;
} }
public RepositoryEntryLifeCycleValue getLifecycleAutoDeleteValue() { public RepositoryEntryLifeCycleValue getLifecycleAutoDeleteValue() {
...@@ -399,7 +399,7 @@ public class RepositoryModule extends AbstractSpringModule { ...@@ -399,7 +399,7 @@ public class RepositoryModule extends AbstractSpringModule {
} }
public String getLifecycleAutoDefinitivelyDelete() { public String getLifecycleAutoDefinitivelyDelete() {
return lifecycleAutoDefinitivelyDelete; return "-".equals(lifecycleAutoDefinitivelyDelete) ? null : lifecycleAutoDefinitivelyDelete;
} }
public RepositoryEntryLifeCycleValue getLifecycleAutoDefinitivelyDeleteValue() { public RepositoryEntryLifeCycleValue getLifecycleAutoDefinitivelyDeleteValue() {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment