X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FSoneInserter.java;h=d9235fd03c7948bf5978760b56590ea4fcd8c667;hb=bac4af4ce1b76a3a2f399dff441684e4268da60c;hp=1445613f52c7684a824b414705b518b71a130047;hpb=8f2392b1ad71157ffdbc78f8074d5a35543c8c75;p=Sone.git

diff --git a/src/main/java/net/pterodactylus/sone/core/SoneInserter.java b/src/main/java/net/pterodactylus/sone/core/SoneInserter.java
index 1445613..d9235fd 100644
--- a/src/main/java/net/pterodactylus/sone/core/SoneInserter.java
+++ b/src/main/java/net/pterodactylus/sone/core/SoneInserter.java
@@ -99,9 +99,6 @@ public class SoneInserter extends AbstractService {
 	/** The Sone to insert. */
 	private volatile Sone sone;
 
-	/** Whether a modification has been detected. */
-	private volatile boolean modified = false;
-
 	/** The fingerprint of the last insert. */
 	private volatile String lastInsertFingerprint;
 
@@ -180,7 +177,7 @@ public class SoneInserter extends AbstractService {
 	 *         otherwise
 	 */
 	public boolean isModified() {
-		return modified;
+		return !lastInsertFingerprint.equals(sone.getFingerprint());
 	}
 
 	//
@@ -204,9 +201,6 @@ public class SoneInserter extends AbstractService {
 				Sone sone = this.sone;
 				if (core.isLocked(sone)) {
 					/* trigger redetection when the Sone is unlocked. */
-					synchronized (sone) {
-						modified = !sone.getFingerprint().equals(lastInsertedFingerprint);
-					}
 					lastFingerprint = "";
 					lastModificationTime = absent();
 					continue;
@@ -217,17 +211,15 @@ public class SoneInserter extends AbstractService {
 					String fingerprint = sone.getFingerprint();
 					if (!fingerprint.equals(lastFingerprint)) {
 						if (fingerprint.equals(lastInsertedFingerprint)) {
-							modified = false;
 							lastModificationTime = absent();
 							logger.log(Level.FINE, String.format("Sone %s has been reverted to last insert state.", sone));
 						} else {
 							lastModificationTime = of(currentTimeMillis());
-							modified = true;
 							logger.log(Level.FINE, String.format("Sone %s has been modified, waiting %d seconds before inserting.", sone.getName(), insertionDelay));
 						}
 						lastFingerprint = fingerprint;
 					}
-					if (modified && lastModificationTime.isPresent() && ((currentTimeMillis() - lastModificationTime.get()) > (insertionDelay * 1000))) {
+					if (lastModificationTime.isPresent() && ((currentTimeMillis() - lastModificationTime.get()) > (insertionDelay * 1000))) {
 						lastInsertedFingerprint = fingerprint;
 						insertSoneNow = true;
 					}
@@ -268,12 +260,11 @@ public class SoneInserter extends AbstractService {
 					 */
 					if (success) {
 						synchronized (sone) {
-							if (lastInsertedFingerprint.equals(sone.getFingerprint())) {
+							if (insertInformation.getFingerprint().equals(sone.getFingerprint())) {
 								logger.log(Level.FINE, String.format("Sone “%s” was not modified further, resetting counter…", sone));
 								lastModificationTime = absent();
-								lastInsertFingerprint = lastInsertedFingerprint;
+								lastInsertFingerprint = insertInformation.getFingerprint();
 								core.touchConfiguration();
-								modified = false;
 							}
 						}
 					}
@@ -293,6 +284,8 @@ public class SoneInserter extends AbstractService {
 	 */
 	private class InsertInformation {
 
+		private final String fingerprint;
+
 		/** All properties of the Sone, copied for thread safety. */
 		private final Map<String, Object> soneProperties = new HashMap<String, Object>();
 
@@ -303,6 +296,7 @@ public class SoneInserter extends AbstractService {
 		 *            The sone to insert
 		 */
 		public InsertInformation(Sone sone) {
+			this.fingerprint = sone.getFingerprint();
 			soneProperties.put("id", sone.getId());
 			soneProperties.put("name", sone.getName());
 			soneProperties.put("time", sone.getTime());
@@ -320,6 +314,10 @@ public class SoneInserter extends AbstractService {
 		// ACCESSORS
 		//
 
+		private String getFingerprint() {
+			return fingerprint;
+		}
+
 		/**
 		 * Returns the insert URI of the Sone.
 		 *