Fixes #77 - devices removal was broken when device events were added in

#57
vitalidze · Jan 31, 2015 · 42dd5f9 · 42dd5f9
1 parent 33ea27e
commit 42dd5f9
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/main/java/org/traccar/web/server/model/DataServiceImpl.java b/src/main/java/org/traccar/web/server/model/DataServiceImpl.java
@@ -366,11 +366,11 @@ public Device removeDevice(Device device) {
             device.setLatestPosition(null);
             entityManager.flush();
 
-            Query query = entityManager.createQuery("DELETE FROM Position x WHERE x.device = :device");
+            Query query = entityManager.createQuery("DELETE FROM DeviceEvent x WHERE x.device = :device");
             query.setParameter("device", device);
             query.executeUpdate();
 
-            query = entityManager.createQuery("DELETE FROM DeviceEvent x WHERE x.device = :device");
+            query = entityManager.createQuery("DELETE FROM Position x WHERE x.device = :device");
             query.setParameter("device", device);
             query.executeUpdate();