From b638b48adcf1e64937baab25eb91bd6e3e84acad Mon Sep 17 00:00:00 2001
From: Christoph Thelen <christoph.thelen@mni.thm.de>
Date: Wed, 24 Oct 2012 10:55:10 +0200
Subject: [PATCH] Create the correct objects when recycling documents
---
src/main/java/de/thm/arsnova/dao/CouchDBDao.java | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/main/java/de/thm/arsnova/dao/CouchDBDao.java b/src/main/java/de/thm/arsnova/dao/CouchDBDao.java
index 023b385f5..435554e26 100644
--- a/src/main/java/de/thm/arsnova/dao/CouchDBDao.java
+++ b/src/main/java/de/thm/arsnova/dao/CouchDBDao.java
@@ -525,9 +525,10 @@ public class CouchDBDao implements IDatabaseDao {
LoggedIn loggedIn = new LoggedIn();
if (results.getJSONArray("rows").optJSONObject(0) != null) {
- loggedIn = (LoggedIn) JSONObject.toBean(
- results.getJSONArray("rows").optJSONObject(0).optJSONObject("value"),
- LoggedIn.class);
+ JSONObject json = results.getJSONArray("rows").optJSONObject(0).optJSONObject("value");
+ loggedIn = (LoggedIn) JSONObject.toBean(json, LoggedIn.class);
+ Collection<VisitedSession> visitedSessions = JSONArray.toCollection(json.getJSONArray("visitedSessions"), VisitedSession.class);
+ loggedIn.setVisitedSessions(new ArrayList<VisitedSession>(visitedSessions));
}
loggedIn.setUser(u.getUsername());
--
GitLab