From: David ‘Bombe’ Roden <bombe@pterodactylus.net>
Date: Wed, 10 Jul 2013 16:38:43 +0000 (+0200)
Subject: Make Sone of Sone inserter modifiable.
X-Git-Tag: 0.8.7^2~37
X-Git-Url: https://git.pterodactylus.net/?a=commitdiff_plain;h=9a920789e2b9109d4de0adb676a00797f2d36bfb;p=Sone.git

Make Sone of Sone inserter modifiable.
---

diff --git a/src/main/java/net/pterodactylus/sone/core/Core.java b/src/main/java/net/pterodactylus/sone/core/Core.java
index 5018b25..af2c3bf 100644
--- a/src/main/java/net/pterodactylus/sone/core/Core.java
+++ b/src/main/java/net/pterodactylus/sone/core/Core.java
@@ -1054,10 +1054,7 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 				sone.setKnown(storedSone.get().isKnown());
 				sone.setStatus((sone.getTime() == 0) ? SoneStatus.unknown : SoneStatus.idle);
 				if (sone.isLocal()) {
-					soneInserters.remove(storedSone.get()).stop();
-					SoneInserter soneInserter = new SoneInserter(this, eventBus, freenetInterface, sone);
-					soneInserters.put(sone, soneInserter);
-					soneInserter.start();
+					soneInserters.get(storedSone.get()).setSone(sone);
 					touchConfiguration();
 				}
 				sones.put(sone.getId(), sone);
diff --git a/src/main/java/net/pterodactylus/sone/core/SoneInserter.java b/src/main/java/net/pterodactylus/sone/core/SoneInserter.java
index 8efcc73..01e414d 100644
--- a/src/main/java/net/pterodactylus/sone/core/SoneInserter.java
+++ b/src/main/java/net/pterodactylus/sone/core/SoneInserter.java
@@ -17,6 +17,8 @@
 
 package net.pterodactylus.sone.core;
 
+import static com.google.common.base.Preconditions.checkArgument;
+
 import java.io.InputStreamReader;
 import java.io.StringWriter;
 import java.nio.charset.Charset;
@@ -90,7 +92,7 @@ public class SoneInserter extends AbstractService {
 	private final FreenetInterface freenetInterface;
 
 	/** The Sone to insert. */
-	private final Sone sone;
+	private volatile Sone sone;
 
 	/** Whether a modification has been detected. */
 	private volatile boolean modified = false;
@@ -123,8 +125,21 @@ public class SoneInserter extends AbstractService {
 	//
 
 	/**
-	 * Changes the insertion delay, i.e. the time the Sone inserter waits after
-	 * it has noticed a Sone modification before it starts the insert.
+	 * Sets the Sone to insert.
+	 *
+	 * @param sone
+	 * 		The Sone to insert
+	 * @return This Sone inserter
+	 */
+	public SoneInserter setSone(Sone sone) {
+		checkArgument((this.sone == null) || sone.equals(this.sone), "Sone to insert can not be set to a different Sone");
+		this.sone = sone;
+		return this;
+	}
+
+	/**
+	 * Changes the insertion delay, i.e. the time the Sone inserter waits after it
+	 * has noticed a Sone modification before it starts the insert.
 	 *
 	 * @param insertionDelay
 	 *            The insertion delay (in seconds)
@@ -175,12 +190,14 @@ public class SoneInserter extends AbstractService {
 		long lastModificationTime = 0;
 		String lastInsertedFingerprint = lastInsertFingerprint;
 		String lastFingerprint = "";
+		Sone sone;
 		while (!shouldStop()) {
 			try {
 				/* check every seconds. */
 				sleep(1000);
 
 				/* don’t insert locked Sones. */
+				sone = this.sone;
 				if (core.isLocked(sone)) {
 					/* trigger redetection when the Sone is unlocked. */
 					synchronized (sone) {