Prevent NullPointerExceptions on new Sones

[Sone.git] / src / main / java / net / pterodactylus / sone / core / SoneModificationDetector.java

diff --git a/src/main/java/net/pterodactylus/sone/core/SoneModificationDetector.java b/src/main/java/net/pterodactylus/sone/core/SoneModificationDetector.java
index 290fcbe..71c28bb 100644 (file)
--- a/src/main/java/net/pterodactylus/sone/core/SoneModificationDetector.java
+++ b/src/main/java/net/pterodactylus/sone/core/SoneModificationDetector.java
@@ -10,6 +10,7 @@ import java.util.concurrent.atomic.AtomicInteger;
 import net.pterodactylus.sone.data.Sone;
 
 import com.google.common.annotations.VisibleForTesting;
+import com.google.common.base.Objects;
 import com.google.common.base.Optional;
 import com.google.common.base.Ticker;
 
@@ -48,12 +49,12 @@ class SoneModificationDetector {
                        return false;
                }
                String fingerprint = lockableFingerprintProvider.getFingerprint();
-               if (originalFingerprint.equals(fingerprint)) {
+               if (fingerprint.equals(originalFingerprint)) {
                        lastModificationTime = absent();
                        lastFingerprint = fingerprint;
                        return false;
                }
-               if (!lastFingerprint.equals(fingerprint)) {
+               if (!Objects.equal(lastFingerprint, fingerprint)) {
                        lastModificationTime = of(ticker.read());
                        lastFingerprint = fingerprint;
                        return false;
@@ -76,7 +77,7 @@ class SoneModificationDetector {
        }
 
        public boolean isModified() {
-               return !lockableFingerprintProvider.getFingerprint().equals(originalFingerprint);
+               return !Objects.equal(lockableFingerprintProvider.getFingerprint(), originalFingerprint);
        }
 
        /**