From 68abcc05ddd3633167f4e1c45d0ae9cf05dbcc43 Mon Sep 17 00:00:00 2001
From: Abyss777 <abyss@fox5.ru>
Date: Tue, 17 Jan 2017 09:36:29 +0500
Subject: - rename otherUserId variable - optimize HashSet creation

---
 src/org/traccar/api/resource/GeofenceResource.java | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/org/traccar/api')

diff --git a/src/org/traccar/api/resource/GeofenceResource.java b/src/org/traccar/api/resource/GeofenceResource.java
index 5f085023a..d5acf106a 100644
--- a/src/org/traccar/api/resource/GeofenceResource.java
+++ b/src/org/traccar/api/resource/GeofenceResource.java
@@ -52,20 +52,20 @@ public class GeofenceResource extends BaseResource {
             geofenceManager.refreshGeofences();
         }
 
-        Set<Long> result;
+        Set<Long> result = new HashSet<>();
         if (all) {
             if (Context.getPermissionsManager().isAdmin(getUserId())) {
-                result = new HashSet<>(geofenceManager.getAllGeofencesIds());
+                result.addAll(geofenceManager.getAllGeofencesIds());
             } else {
                 Context.getPermissionsManager().checkManager(getUserId());
-                result = new HashSet<>(geofenceManager.getManagedGeofencesIds(getUserId()));
+                result.addAll(geofenceManager.getManagedGeofencesIds(getUserId()));
             }
         } else {
             if (userId == 0) {
                 userId = getUserId();
             }
             Context.getPermissionsManager().checkUser(getUserId(), userId);
-            result = new HashSet<>(geofenceManager.getUserGeofencesIds(userId));
+            result.addAll(geofenceManager.getUserGeofencesIds(userId));
         }
 
         if (groupId != 0) {
-- 
cgit v1.2.3