From ccb2c45c77597c5ff0b0d4a865af5d91e9790a38 Mon Sep 17 00:00:00 2001
From: Paul-Christian Volkmer <paul-christian.volkmer@mni.thm.de>
Date: Tue, 4 Jun 2013 16:31:16 +0200
Subject: [PATCH] Fixed null pointer dereference
---
src/main/java/de/thm/arsnova/entities/LoggedIn.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/main/java/de/thm/arsnova/entities/LoggedIn.java b/src/main/java/de/thm/arsnova/entities/LoggedIn.java
index b6613a9a..4c635dbb 100644
--- a/src/main/java/de/thm/arsnova/entities/LoggedIn.java
+++ b/src/main/java/de/thm/arsnova/entities/LoggedIn.java
@@ -122,7 +122,7 @@ public class LoggedIn {
}
public boolean hasConflicts() {
- return ! (_conflicts == null && _conflicts.isEmpty());
+ return ! (_conflicts == null || _conflicts.isEmpty());
}
@Override
--
GitLab