commit 71b745cbb47154fb36a28a6661c0d4ed78f05d15
author David Pursehouse <dpursehouse@digital.ai> Tue Jun 23 11:15:18 2020 +0900
committer David Pursehouse <dpursehouse@digital.ai> Tue Jun 23 14:03:34 2020 +0900
tree 67fc6dcbd37bd85ed24f8b007bb27f607fbb4129
parent e8212c861f8aa4e61e1a781577229f7f2d01f794

LfsLocksHandle: Collapse duplicate if-block

Also fix boolean condition to avoid potential NPE on comparison of
Boolean instance using primitive.

Change-Id: I55d173796a3bdf821cae357aaaaca8f19ad80b95

src/main/java/com/googlesource/gerrit/plugins/lfs/locks/LfsLocksHandler.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/lfs/locks/LfsLocksHandler.java b/src/main/java/com/googlesource/gerrit/plugins/lfs/locks/LfsLocksHandler.java
index 48f6c17..1e75677 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/lfs/locks/LfsLocksHandler.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/lfs/locks/LfsLocksHandler.java
@@ -101,10 +101,8 @@
 
     LfsLock lock = hasLock.get();
     Optional<String> username = user.getUserName();
-    if (username.isPresent() && lock.owner.name.equals(username.get())) {
-      locks.deleteLock(lock);
-      return new LfsLockResponse(lock);
-    } else if (input.force) {
+    if ((username.isPresent() && lock.owner.name.equals(username.get()))
+        || Boolean.TRUE.equals(input.force)) {
       locks.deleteLock(lock);
       return new LfsLockResponse(lock);
     }