commit 0e907f9812ca9bb201c6f1e799ff24bdd39400fb
author Gustaf Lundh <gustaflh@axis.com> Fri Sep 23 14:45:33 2016 +0200
committer David Pursehouse <dpursehouse@collab.net> Fri Sep 23 15:32:39 2016 +0200
tree 16055c6e777cbb1d3bf183db7ededa7cdf6775c3
parent cc6a0cd4eeba57ca32c5514370677e887f929490

SetAssigneeOp fails to detect identical assignee.

Also removed unnecessary null checks for optional objects.

Change-Id: Ia1f6218b75dcaea751c089eab29a5a285c2c6b8d

gerrit-server/src/main/java/com/google/gerrit/server/change/SetAssigneeOp.java

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 4d15fdd..30fd54d 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 @@
     Optional<Account.Id> 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;
     }