Skip to content

Commit 344af21

Browse files
cpovirkGoogle Java Core Libraries
authored andcommitted
RELNOTES=n/a PiperOrigin-RevId: 805855256
1 parent 2de6495 commit 344af21

File tree

6 files changed

+6
-6
lines changed

6 files changed

+6
-6
lines changed

android/guava/src/com/google/common/io/BaseEncoding.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1011,7 +1011,7 @@ void encodeTo(Appendable target, byte[] bytes, int off, int len) throws IOExcept
10111011
checkPositionIndexes(off, off + len, bytes.length);
10121012
int i = off;
10131013
for (int remaining = len; remaining >= 3; remaining -= 3) {
1014-
int chunk = (bytes[i++] & 0xFF) << 16 | (bytes[i++] & 0xFF) << 8 | bytes[i++] & 0xFF;
1014+
int chunk = (bytes[i++] & 0xFF) << 16 | (bytes[i++] & 0xFF) << 8 | (bytes[i++] & 0xFF);
10151015
target.append(alphabet.encode(chunk >>> 18));
10161016
target.append(alphabet.encode((chunk >>> 12) & 0x3F));
10171017
target.append(alphabet.encode((chunk >>> 6) & 0x3F));

android/guava/src/com/google/common/math/IntMath.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -593,7 +593,7 @@ public static int saturatedPow(int b, int k) {
593593
}
594594
int accum = 1;
595595
// if b is negative and k is odd then the limit is MIN otherwise the limit is MAX
596-
int limit = Integer.MAX_VALUE + ((b >>> Integer.SIZE - 1) & (k & 1));
596+
int limit = Integer.MAX_VALUE + ((b >>> (Integer.SIZE - 1)) & (k & 1));
597597
while (true) {
598598
switch (k) {
599599
case 0:

android/guava/src/com/google/common/util/concurrent/AbstractCatchingFuture.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ public final void run() {
8080
@RetainedLocalRef ListenableFuture<? extends V> localInputFuture = inputFuture;
8181
@RetainedLocalRef Class<X> localExceptionType = exceptionType;
8282
@RetainedLocalRef F localFallback = fallback;
83-
if (localInputFuture == null | localExceptionType == null | localFallback == null
83+
if ((localInputFuture == null | localExceptionType == null | localFallback == null)
8484
// This check, unlike all the others, is a volatile read
8585
|| isCancelled()) {
8686
return;

guava/src/com/google/common/io/BaseEncoding.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1011,7 +1011,7 @@ void encodeTo(Appendable target, byte[] bytes, int off, int len) throws IOExcept
10111011
checkPositionIndexes(off, off + len, bytes.length);
10121012
int i = off;
10131013
for (int remaining = len; remaining >= 3; remaining -= 3) {
1014-
int chunk = (bytes[i++] & 0xFF) << 16 | (bytes[i++] & 0xFF) << 8 | bytes[i++] & 0xFF;
1014+
int chunk = (bytes[i++] & 0xFF) << 16 | (bytes[i++] & 0xFF) << 8 | (bytes[i++] & 0xFF);
10151015
target.append(alphabet.encode(chunk >>> 18));
10161016
target.append(alphabet.encode((chunk >>> 12) & 0x3F));
10171017
target.append(alphabet.encode((chunk >>> 6) & 0x3F));

guava/src/com/google/common/math/IntMath.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -593,7 +593,7 @@ public static int saturatedPow(int b, int k) {
593593
}
594594
int accum = 1;
595595
// if b is negative and k is odd then the limit is MIN otherwise the limit is MAX
596-
int limit = Integer.MAX_VALUE + ((b >>> Integer.SIZE - 1) & (k & 1));
596+
int limit = Integer.MAX_VALUE + ((b >>> (Integer.SIZE - 1)) & (k & 1));
597597
while (true) {
598598
switch (k) {
599599
case 0:

guava/src/com/google/common/util/concurrent/AbstractCatchingFuture.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ public final void run() {
8080
@RetainedLocalRef ListenableFuture<? extends V> localInputFuture = inputFuture;
8181
@RetainedLocalRef Class<X> localExceptionType = exceptionType;
8282
@RetainedLocalRef F localFallback = fallback;
83-
if (localInputFuture == null | localExceptionType == null | localFallback == null
83+
if ((localInputFuture == null | localExceptionType == null | localFallback == null)
8484
// This check, unlike all the others, is a volatile read
8585
|| isCancelled()) {
8686
return;

0 commit comments

Comments
 (0)