Revert "Revert "Keep reply with most severe error when merging error replies""

This reverts commit 9263966a9c697f5acff53a595493e27a2f05e683.

1 files changed, 4 insertions, 4 deletions

diff --git a/document/src/main/java/com/yahoo/document/BucketId.java b/document/src/main/java/com/yahoo/document/BucketId.java
index 36ec53c51d3..f6d3dc34af1 100755
--- a/document/src/main/java/com/yahoo/document/BucketId.java
+++ b/document/src/main/java/com/yahoo/document/BucketId.java
@@ -74,9 +74,9 @@ public class BucketId implements Comparable<BucketId> {
 
     public int compareTo(BucketId other) {
         if (id >>> 32 == other.id >>> 32) {
-            if ((id & 0xFFFFFFFFl) > (other.id & 0xFFFFFFFFl)) {
+            if ((id & 0xFFFFFFFFL) > (other.id & 0xFFFFFFFFL)) {
                 return 1;
-            } else if ((id & 0xFFFFFFFFl) < (other.id & 0xFFFFFFFFl)) {
+            } else if ((id & 0xFFFFFFFFL) < (other.id & 0xFFFFFFFFL)) {
                 return -1;
             }
             return 0;
@@ -97,8 +97,8 @@ public class BucketId implements Comparable<BucketId> {
 
     public long getId() {
         int notUsed = 64 - getUsedBits();
-        long usedMask = (0xFFFFFFFFFFFFFFFFl << notUsed) >>> notUsed;
-        long countMask = (0xFFFFFFFFFFFFFFFFl >>> (64 - COUNT_BITS)) << (64 - COUNT_BITS);
+        long usedMask  = (0xFFFFFFFFFFFFFFFFL << notUsed) >>> notUsed;
+        long countMask = (0xFFFFFFFFFFFFFFFFL >>> (64 - COUNT_BITS)) << (64 - COUNT_BITS);
         return id & (usedMask | countMask);
     }