do unlock in finally; prevent deadlocks when excetion is thrown

weaondara · Feb 14, 2016 · a923efa · a923efa
1 parent fd3650c
commit a923efa
Showing 1 changed file with 14 additions and 10 deletions.
diff --git a/src/main/java/net/alpenblock/bungeeperms/CleanupTask.java b/src/main/java/net/alpenblock/bungeeperms/CleanupTask.java
@@ -11,19 +11,23 @@ public void run()
         long threshold = bp.getConfig().getCleanupThreshold() * 1000;
 
         pm.getUserlock().writeLock().lock();
-
-        for(User u : pm.getUsers())
+        try
         {
-            if((bp.getConfig().isUseUUIDs() ? bp.getPlugin().getPlayer(u.getUUID()) : bp.getPlugin().getPlayer(u.getName())) != null)
-            {
-                continue;
-            }
-            if(u.getLastAccess() + threshold < System.currentTimeMillis())
+            for(User u : pm.getUsers())
             {
-                pm.removeUserFromCache(u);
+                if((bp.getConfig().isUseUUIDs() ? bp.getPlugin().getPlayer(u.getUUID()) : bp.getPlugin().getPlayer(u.getName())) != null)
+                {
+                    continue;
+                }
+                if(u.getLastAccess() + threshold < System.currentTimeMillis())
+                {
+                    pm.removeUserFromCache(u);
+                }
             }
         }
-
-        pm.getUserlock().writeLock().unlock();
+        finally
+        {
+            pm.getUserlock().writeLock().unlock();
+        }
     }
 }