commit | 767d0bab23e1920805a9b50f088036328d9b27ce | [log] [tgz] |
---|---|---|
author | David Pursehouse <dpursehouse@digital.ai> | Tue Jun 23 11:11:25 2020 +0900 |
committer | David Pursehouse <dpursehouse@digital.ai> | Tue Jun 23 14:01:18 2020 +0900 |
tree | 600ffe74cb33458964dc53a1db7d74278d411e15 | |
parent | 8f6926a337703187041da4908c3f4964f2c27a49 [diff] |
LfsLocksHandler: Call Optional#isPresent before #get Change-Id: I688d0bc9111d3d9797ccb901ff0fa062e7fb33b5
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 1de28f4..c4a1ad3 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
@@ -99,7 +99,8 @@ } LfsLock lock = hasLock.get(); - if (lock.owner.name.equals(user.getUserName().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) {