Merge tag 'tags/v6.3'

1 files changed, 5 insertions, 5 deletions

diff --git a/src/main/java/org/traccar/session/cache/CacheManager.java b/src/main/java/org/traccar/session/cache/CacheManager.java
index 064e5672f..39546a5a7 100644
--- a/src/main/java/org/traccar/session/cache/CacheManager.java
+++ b/src/main/java/org/traccar/session/cache/CacheManager.java
@@ -170,7 +170,7 @@ public class CacheManager implements BroadcastInterface {
     public void removeDevice(long deviceId) {
         try {
             lock.writeLock().lock();
-            if (deviceReferences.computeIfAbsent(deviceId, k -> new AtomicInteger()).incrementAndGet() <= 0) {
+            if (deviceReferences.computeIfAbsent(deviceId, k -> new AtomicInteger()).decrementAndGet() <= 0) {
                 graph.removeObject(Device.class, deviceId);
                 devicePositions.remove(deviceId);
                 deviceReferences.remove(deviceId);
@@ -296,8 +296,8 @@ public class CacheManager implements BroadcastInterface {
                 }
             }
         } else {
-            if (object instanceof GroupedModel) {
-                long groupId = ((GroupedModel) object).getGroupId();
+            if (object instanceof GroupedModel groupedModel) {
+                long groupId = groupedModel.getGroupId();
                 if (groupId > 0) {
                     invalidatePermission(object.getClass(), object.getId(), Group.class, groupId, true);
                 }
@@ -319,8 +319,8 @@ public class CacheManager implements BroadcastInterface {
                 }
             }
 
-            if (object instanceof Schedulable) {
-                long calendarId = ((Schedulable) object).getCalendarId();
+            if (object instanceof Schedulable schedulable) {
+                long calendarId = schedulable.getCalendarId();
                 if (calendarId > 0) {
                     invalidatePermission(object.getClass(), object.getId(), Calendar.class, calendarId, true);
                 }