diff options
| author | Anton Tananaev <anton.tananaev@gmail.com> | 2013-01-10 23:42:16 +1300 |
|---|---|---|
| committer | Anton Tananaev <anton.tananaev@gmail.com> | 2013-01-10 23:42:16 +1300 |
| commit | 5100c457ad2f1faf1cffa8503c6baaf3a26c5d89 (patch) | |
| tree | a848e347421c88ce3288391e250c76737fd50e05 /src/org/traccar/web/server | |
| parent | 137c89bc9a870c4018f4c000494c89af9ceea67a (diff) | |
| download | etbsa-traccar-web-5100c457ad2f1faf1cffa8503c6baaf3a26c5d89.tar.gz etbsa-traccar-web-5100c457ad2f1faf1cffa8503c6baaf3a26c5d89.tar.bz2 etbsa-traccar-web-5100c457ad2f1faf1cffa8503c6baaf3a26c5d89.zip | |
Archive panel and some map features
Diffstat (limited to 'src/org/traccar/web/server')
| -rw-r--r-- | src/org/traccar/web/server/model/DataServiceImpl.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/org/traccar/web/server/model/DataServiceImpl.java b/src/org/traccar/web/server/model/DataServiceImpl.java index f9d0e7e..9c69b48 100644 --- a/src/org/traccar/web/server/model/DataServiceImpl.java +++ b/src/org/traccar/web/server/model/DataServiceImpl.java @@ -142,7 +142,8 @@ public class DataServiceImpl extends RemoteServiceServlet implements DataService try { device = entityManager.merge(device); user.getDevices().remove(device); - entityManager.remove(device); + // If you want to remove device you need to remove all linked positions + //entityManager.remove(device); entityManager.getTransaction().commit(); } catch (Exception e) { entityManager.getTransaction().rollback(); |