diff options
author | Fabio Ponciroli <ponch78@gmail.com> | 2022-03-17 22:49:22 +0100 |
---|---|---|
committer | Fabio Ponciroli <ponch78@gmail.com> | 2022-05-20 20:12:29 +0200 |
commit | 4ac6e7b505a13a0b0f26e2e0330c201540a8aa5d (patch) | |
tree | 81b22cb2479ee46c873df1dc9ba9090fdc415ec9 /org.eclipse.jgit/src/org/eclipse | |
parent | 88d5f51e61f7f90b4f760261f07c95d8dd3d7299 (diff) | |
download | jgit-4ac6e7b505a13a0b0f26e2e0330c201540a8aa5d.tar.gz jgit-4ac6e7b505a13a0b0f26e2e0330c201540a8aa5d.zip |
PackFileSnapshot: Resolve warnings by using "equals" instead of "=="
Errorprone raises the following warning: "[ReferenceEquality] Comparison
using reference equality instead of value equality"
Added Equality#isSameInstance util method to be reused in similar cases.
Change-Id: Ifc9885c9806dcafa1c5ee1351d3095bf1517dbf5
Diffstat (limited to 'org.eclipse.jgit/src/org/eclipse')
-rw-r--r-- | org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackFileSnapshot.java | 4 | ||||
-rw-r--r-- | org.eclipse.jgit/src/org/eclipse/jgit/util/Equality.java | 36 |
2 files changed, 39 insertions, 1 deletions
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackFileSnapshot.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackFileSnapshot.java index 17bd863528..a784af8c3f 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackFileSnapshot.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackFileSnapshot.java @@ -15,6 +15,7 @@ import java.io.RandomAccessFile; import org.eclipse.jgit.lib.AnyObjectId; import org.eclipse.jgit.lib.ObjectId; +import org.eclipse.jgit.util.Equality; class PackFileSnapshot extends FileSnapshot { @@ -61,7 +62,8 @@ class PackFileSnapshot extends FileSnapshot { } boolean isChecksumChanged(File packFile) { - return wasChecksumChanged = checksum != MISSING_CHECKSUM + return wasChecksumChanged = !Equality.isSameInstance(checksum, + MISSING_CHECKSUM) && !checksum.equals(readChecksum(packFile)); } diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/util/Equality.java b/org.eclipse.jgit/src/org/eclipse/jgit/util/Equality.java new file mode 100644 index 0000000000..da1684630b --- /dev/null +++ b/org.eclipse.jgit/src/org/eclipse/jgit/util/Equality.java @@ -0,0 +1,36 @@ +/* + * Copyright (C) 2022, Fabio Ponciroli <ponch78@gmail.com> and others + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Distribution License v. 1.0 which is available at + * https://www.eclipse.org/org/documents/edl-v10.php. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +package org.eclipse.jgit.util; + +/** + * Equality utilities. + * + * @since: 6.2 + */ +public class Equality { + + /** + * Compare by reference + * + * @param a + * First object to compare + * @param b + * Second object to compare + * @return {@code true} if the objects are identical, {@code false} + * otherwise + * + * @since 6.2 + */ + @SuppressWarnings("ReferenceEquality") + public static <T> boolean isSameInstance(T a, T b) { + return a == b; + } +}
\ No newline at end of file |