Skip to content
Snippets Groups Projects
Commit 0ed1c3e3 authored by srosse's avatar srosse
Browse files

OO-2128: don't copy missing rules (patch S. Clemenz)

parent 8c969c71
No related branches found
No related tags found
No related merge requests found
...@@ -116,7 +116,7 @@ public class ReminderServiceImpl implements ReminderService { ...@@ -116,7 +116,7 @@ public class ReminderServiceImpl implements ReminderService {
if(StringHelper.containsNonWhitespace(configuration)) { if(StringHelper.containsNonWhitespace(configuration)) {
ReminderRules rules = toRules(configuration); ReminderRules rules = toRules(configuration);
for(ReminderRule rule:rules.getRules()) { for(ReminderRule rule:rules.getRules()) {
if(ReminderRuleEngine.DATE_RULE_TYPE.equals(rule.getType()) && rule instanceof ReminderRuleImpl) { if(rule instanceof ReminderRuleImpl && ReminderRuleEngine.DATE_RULE_TYPE.equals(rule.getType())) {
ReminderRuleImpl r = (ReminderRuleImpl)rule; ReminderRuleImpl r = (ReminderRuleImpl)rule;
if(DateRuleSPI.AFTER.equals(r.getOperator()) && StringHelper.containsNonWhitespace(r.getRightOperand())) { if(DateRuleSPI.AFTER.equals(r.getOperator()) && StringHelper.containsNonWhitespace(r.getRightOperand())) {
try { try {
......
...@@ -443,7 +443,8 @@ public class CourseHandler implements RepositoryHandler { ...@@ -443,7 +443,8 @@ public class CourseHandler implements RepositoryHandler {
RuleSPI ruleSpi = reminderModule.getRuleSPIByType(rule.getType()); RuleSPI ruleSpi = reminderModule.getRuleSPIByType(rule.getType());
if(ruleSpi != null) { if(ruleSpi != null) {
ReminderRule clonedRule = ruleSpi.clone(rule, envMapper); ReminderRule clonedRule = ruleSpi.clone(rule, envMapper);
clonedRules.getRules().add(clonedRule); if (clonedRule != null)
clonedRules.getRules().add(clonedRule);
} }
} }
......
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