(accumulo) branch 2.1 updated: Protect against null tserver lock var in TabletServerLocks (#4878)

[dlmarion]

This is an automated email from the ASF dual-hosted git repository.

dlmarion pushed a commit to branch 2.1
in repository https://gitbox.apache.org/repos/asf/accumulo.git


The following commit(s) were added to refs/heads/2.1 by this push:
     new b93939d370 Protect against null tserver lock var in TabletServerLocks 
(#4878)
b93939d370 is described below

commit b93939d3700c21ab179799a74cb2495f862dbd37
Author: Dave Marion <dlmar...@apache.org>
AuthorDate: Mon Sep 16 08:40:40 2024 -0400

    Protect against null tserver lock var in TabletServerLocks (#4878)
    
    Fixes #4862
---
 .../java/org/apache/accumulo/server/util/TabletServerLocks.java    | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git 
a/server/base/src/main/java/org/apache/accumulo/server/util/TabletServerLocks.java
 
b/server/base/src/main/java/org/apache/accumulo/server/util/TabletServerLocks.java
index e55237d327..6be2b6d53c 100644
--- 
a/server/base/src/main/java/org/apache/accumulo/server/util/TabletServerLocks.java
+++ 
b/server/base/src/main/java/org/apache/accumulo/server/util/TabletServerLocks.java
@@ -58,11 +58,12 @@ public class TabletServerLocks {
     } else {
       if (lock == null) {
         printUsage();
+      } else {
+        ServiceLock.ServiceLockPath path = ServiceLock.path(tserverPath + "/" 
+ lock);
+        ServiceLock.deleteLock(zoo, path);
+        System.out.printf("Deleted %s", path);
       }
 
-      ServiceLock.ServiceLockPath path = ServiceLock.path(tserverPath + "/" + 
lock);
-      ServiceLock.deleteLock(zoo, path);
-      System.out.printf("Deleted %s", path);
     }
   }