From 567598ea25007e9e142f6a8c3b8406ecad920be1 Mon Sep 17 00:00:00 2001
From: Paul-Christian Volkmer <paul-christian.volkmer@mni.thm.de>
Date: Tue, 4 Jun 2013 16:19:31 +0200
Subject: [PATCH] Add property to LoggedIn entity
This indicates conflicts in CouchDB that should be handled by
application. Those conflicts might occure, if a single user is logged in
on two different devices at the same time.
---
src/main/java/de/thm/arsnova/entities/LoggedIn.java | 13 +++++++++++++
1 file changed, 13 insertions(+)
diff --git a/src/main/java/de/thm/arsnova/entities/LoggedIn.java b/src/main/java/de/thm/arsnova/entities/LoggedIn.java
index d37decdb..b6613a9a 100644
--- a/src/main/java/de/thm/arsnova/entities/LoggedIn.java
+++ b/src/main/java/de/thm/arsnova/entities/LoggedIn.java
@@ -31,6 +31,7 @@ public class LoggedIn {
private String sessionId;
private long timestamp;
private List<VisitedSession> visitedSessions = new ArrayList<VisitedSession>();
+ private List<String> _conflicts;
public LoggedIn() {
this.type = "logged_in";
@@ -111,6 +112,18 @@ public class LoggedIn {
public void setVisitedSessions(List<VisitedSession> visitedSessions) {
this.visitedSessions = visitedSessions;
}
+
+ public List<String> get_conflicts() {
+ return _conflicts;
+ }
+
+ public void set_conflicts(List<String> _conflicts) {
+ this._conflicts = _conflicts;
+ }
+
+ public boolean hasConflicts() {
+ return ! (_conflicts == null && _conflicts.isEmpty());
+ }
@Override
public String toString() {
--
GitLab