From 1426cfce618cf266d8f096074100a3a267d2a175 Mon Sep 17 00:00:00 2001
From: Daniel Gerhardt <code@dgerhardt.net>
Date: Thu, 17 Jan 2019 16:54:04 +0100
Subject: [PATCH] Don't run ScoreCalculatorFactoryImpl's event handlers if
roomId is null
---
.../service/score/ScoreCalculatorFactoryImpl.java | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/main/java/de/thm/arsnova/service/score/ScoreCalculatorFactoryImpl.java b/src/main/java/de/thm/arsnova/service/score/ScoreCalculatorFactoryImpl.java
index 2eea76075..a9b68b967 100644
--- a/src/main/java/de/thm/arsnova/service/score/ScoreCalculatorFactoryImpl.java
+++ b/src/main/java/de/thm/arsnova/service/score/ScoreCalculatorFactoryImpl.java
@@ -56,31 +56,31 @@ public class ScoreCalculatorFactoryImpl implements ScoreCalculatorFactory, Appli
return scoreCalculator;
}
- @CacheEvict(value = "score", key = "#event.entity.roomId")
+ @CacheEvict(value = "score", key = "#event.entity.roomId", condition = "#event.entity.roomId != null")
@EventListener
public void handleAfterContentCreation(AfterCreationEvent<Content> event) {
this.publisher.publishEvent(new ChangeScoreEvent(this, event.getEntity().getRoomId()));
}
- @CacheEvict(value = "score", key = "#event.entity.roomId")
+ @CacheEvict(value = "score", key = "#event.entity.roomId", condition = "#event.entity.roomId != null")
@EventListener(condition = "#event.stateName == 'state'")
public void handleContentStateChange(StateChangeEvent<Content, Content.State> event) {
this.publisher.publishEvent(new ChangeScoreEvent(this, event.getEntity().getRoomId()));
}
- @CacheEvict(value = "score", key = "#event.entity.roomId")
+ @CacheEvict(value = "score", key = "#event.entity.roomId", condition = "#event.entity.roomId != null")
@EventListener
public void handleNewAnswer(AfterCreationEvent<Answer> event) {
this.publisher.publishEvent(new ChangeScoreEvent(this, event.getEntity().getRoomId()));
}
- @CacheEvict(value = "score", key = "#event.entity.roomId")
+ @CacheEvict(value = "score", key = "#event.entity.roomId", condition = "#event.entity.roomId != null")
@EventListener
public void handleDeleteAnswer(AfterDeletionEvent<Answer> event) {
this.publisher.publishEvent(new ChangeScoreEvent(this, event.getEntity().getRoomId()));
}
- @CacheEvict(value = "score", key = "#event.entity.roomId")
+ @CacheEvict(value = "score", key = "#event.entity.roomId", condition = "#event.entity.roomId != null")
@EventListener
public void handleDeleteQuestion(AfterDeletionEvent<Content> event) {
this.publisher.publishEvent(new ChangeScoreEvent(this, event.getEntity().getRoomId()));
--
GitLab