From 6d48729efb4bd1ac34bba003a8a4313a70a02cce Mon Sep 17 00:00:00 2001
From: Anton Tananaev <anton.tananaev@gmail.com>
Date: Sat, 16 Feb 2013 16:55:44 +1300
Subject: Handle clicks on markers (fix #8)

---
 src/org/traccar/web/server/model/DataServiceImpl.java | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src/org/traccar/web/server/model/DataServiceImpl.java')

diff --git a/src/org/traccar/web/server/model/DataServiceImpl.java b/src/org/traccar/web/server/model/DataServiceImpl.java
index e48fa73c..287a5684 100644
--- a/src/org/traccar/web/server/model/DataServiceImpl.java
+++ b/src/org/traccar/web/server/model/DataServiceImpl.java
@@ -152,6 +152,7 @@ public class DataServiceImpl extends RemoteServiceServlet implements DataService
             try {
                 entityManager.persist(device);
                 user.getDevices().add(device);
+                entityManager.merge(user);
                 entityManager.getTransaction().commit();
                 return device;
             } catch (RuntimeException e) {
@@ -191,6 +192,7 @@ public class DataServiceImpl extends RemoteServiceServlet implements DataService
                 device = entityManager.merge(device);
                 user.getDevices().remove(device);
                 entityManager.remove(device);
+                entityManager.merge(user);
                 entityManager.getTransaction().commit();
                 return device;
             } catch (RuntimeException e) {
-- 
cgit v1.2.3