diff options
| author | Jon Marius Venstad <jonmv@users.noreply.github.com> | 2021-01-06 20:41:35 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-06 20:41:35 +0100 |
| commit | 84d629c5125f2e0afc93ed730875215cb68f1f38 (patch) | |
| tree | 8c18740ad87cbfa6ad4fd677134e2558ea7e0966 /document | |
| parent | de99454f659776737db705edd72880971b2ae25d (diff) | |
| parent | 0c675bb75556b4de4abdbf33149c70a01447d5d6 (diff) | |
Merge pull request #15926 from vespa-engine/jonmv/keep-most-severe-error-reply-when-merging
Keep reply with most severe error when merging error replies
Diffstat (limited to 'document')
| -rwxr-xr-x | document/src/main/java/com/yahoo/document/BucketId.java | 8 |
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); } |