From d255c8c96f48b9fc2d613e0bd9a95446e1e1837a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20G=C3=A4rtner?= <andreas.gaertner@hotmail.com>
Date: Thu, 10 Dec 2015 19:11:15 +0100
Subject: [PATCH] Prevent NullPointerException when no feedback is present in
storage
---
.../java/de/thm/arsnova/FeedbackStorage.java | 16 +++++++++-------
1 file changed, 9 insertions(+), 7 deletions(-)
diff --git a/src/main/java/de/thm/arsnova/FeedbackStorage.java b/src/main/java/de/thm/arsnova/FeedbackStorage.java
index e6ec8854..afa717dd 100644
--- a/src/main/java/de/thm/arsnova/FeedbackStorage.java
+++ b/src/main/java/de/thm/arsnova/FeedbackStorage.java
@@ -137,13 +137,15 @@ public class FeedbackStorage {
final Map<User, FeedbackStorageObject> sessionFeedbacks = data.get(session);
final List<User> affectedUsers = new ArrayList<User>();
- for (final Map.Entry<User, FeedbackStorageObject> entry : sessionFeedbacks.entrySet()) {
- final User user = entry.getKey();
- final FeedbackStorageObject feedback = entry.getValue();
- final boolean timeIsUp = feedback.getTimestamp().before(maxAllowedTime);
- if (timeIsUp) {
- sessionFeedbacks.remove(user);
- affectedUsers.add(user);
+ if (sessionFeedbacks != null) {
+ for (final Map.Entry<User, FeedbackStorageObject> entry : sessionFeedbacks.entrySet()) {
+ final User user = entry.getKey();
+ final FeedbackStorageObject feedback = entry.getValue();
+ final boolean timeIsUp = feedback.getTimestamp().before(maxAllowedTime);
+ if (timeIsUp) {
+ sessionFeedbacks.remove(user);
+ affectedUsers.add(user);
+ }
}
}
return affectedUsers;
--
GitLab