From 0e907f9812ca9bb201c6f1e799ff24bdd39400fb Mon Sep 17 00:00:00 2001 From: Gustaf Lundh Date: Fri, 23 Sep 2016 14:45:33 +0200 Subject: [PATCH] SetAssigneeOp fails to detect identical assignee. Also removed unnecessary null checks for optional objects. Change-Id: Ia1f6218b75dcaea751c089eab29a5a285c2c6b8d --- .../com/google/gerrit/server/change/SetAssigneeOp.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/SetAssigneeOp.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/SetAssigneeOp.java index 4d15fddcf5..30fd54d459 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/change/SetAssigneeOp.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/SetAssigneeOp.java @@ -78,18 +78,18 @@ public class SetAssigneeOp extends BatchUpdate.Op { Optional oldAssigneeId = Optional.fromNullable(ctx.getChange().getAssignee()); if (input.assignee == null) { - if (oldAssigneeId != null && oldAssigneeId.isPresent()) { + if (oldAssigneeId.isPresent()) { throw new BadRequestException("Cannot set Assignee to empty"); } return false; } Account oldAssignee = null; - if (oldAssigneeId != null && oldAssigneeId.isPresent()) { + if (oldAssigneeId.isPresent()) { oldAssignee = accountInfosFactory.create().get(oldAssigneeId.get()); } IdentifiedUser newAssigneeUser = accounts.parse(input.assignee); - if (oldAssigneeId != null && - oldAssigneeId.equals(newAssigneeUser.getAccountId())) { + if (oldAssigneeId.isPresent() && + oldAssigneeId.get().equals(newAssigneeUser.getAccountId())) { newAssignee = oldAssignee; return false; }