commit 4d03f48c9e4b07a98520e269e8725cf82bc7ffd0
author ekempin <ekempin@google.com> Wed Jan 04 07:16:33 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Jan 04 07:16:34 2017 +0000
tree bf11275373b7f7df36759984a74f9d1148dcd45d
parent fd4177ea71a1e30d33a3cbf89cd31a425ba4cc18
parent ba686d7ee9784b72a05f4cf8aa20040f85c35dbe

Merge "Fix comments on patch set getting out to 'Auto Merge'"

gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/CommentManager.java

diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/CommentManager.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/CommentManager.java
index 1d1ead9..7419dd5 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/CommentManager.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/CommentManager.java
@@ -130,7 +130,7 @@
   }
 
   Side getStoredSideFromDisplaySide(DisplaySide side) {
-    if (side == DisplaySide.A && base.isBaseOrAutoMerge() || base.isParent()) {
+    if (side == DisplaySide.A && (base.isBaseOrAutoMerge() || base.isParent())) {
       return Side.PARENT;
     }
     return Side.REVISION;