X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fde%2Ftodesbaum%2Fjsite%2Fapplication%2FProjectInserter.java;h=756e121c67273cb84bac35ecbb4c710ab7091f85;hb=ed54585ba9537da09379df378e51216e9ae528c1;hp=32c9c5bcf3e2161c1675db2c5cec862143086870;hpb=9ea58e546eed711db445591dddda1b0bd0f5a09a;p=jSite.git

diff --git a/src/de/todesbaum/jsite/application/ProjectInserter.java b/src/de/todesbaum/jsite/application/ProjectInserter.java
index 32c9c5b..756e121 100644
--- a/src/de/todesbaum/jsite/application/ProjectInserter.java
+++ b/src/de/todesbaum/jsite/application/ProjectInserter.java
@@ -88,6 +88,12 @@ public class ProjectInserter implements FileScannerListener, Runnable {
 	/** The temp directory. */
 	private String tempDirectory;
 
+	/** The current connection. */
+	private Connection connection;
+
+	/** Whether the insert is cancelled. */
+	private volatile boolean cancelled = false;
+
 	/**
 	 * Adds a listener to the list of registered listeners.
 	 *
@@ -217,12 +223,25 @@ public class ProjectInserter implements FileScannerListener, Runnable {
 	 * Starts the insert.
 	 */
 	public void start() {
+		cancelled = false;
 		fileScanner = new FileScanner(project);
 		fileScanner.addFileScannerListener(this);
 		new Thread(fileScanner).start();
 	}
 
 	/**
+	 * Stops the current insert.
+	 */
+	public void stop() {
+		cancelled = true;
+		synchronized (lockObject) {
+			if (connection != null) {
+				connection.disconnect();
+			}
+		}
+	}
+
+	/**
 	 * Creates an input stream that delivers the given file, replacing edition
 	 * tokens in the file’s content, if necessary.
 	 *
@@ -462,7 +481,9 @@ public class ProjectInserter implements FileScannerListener, Runnable {
 		List<String> files = fileScanner.getFiles();
 
 		/* create connection to node */
-		Connection connection = freenetInterface.getConnection("project-insert-" + random + counter++);
+		synchronized (lockObject) {
+			connection = freenetInterface.getConnection("project-insert-" + random + counter++);
+		}
 		connection.setTempDirectory(tempDirectory);
 		boolean connected = false;
 		Throwable cause = null;
@@ -472,8 +493,8 @@ public class ProjectInserter implements FileScannerListener, Runnable {
 			cause = e1;
 		}
 
-		if (!connected) {
-			fireProjectInsertFinished(false, cause);
+		if (!connected || cancelled) {
+			fireProjectInsertFinished(false, cancelled ? new AbortedException() : cause);
 			return;
 		}
 
@@ -520,7 +541,7 @@ public class ProjectInserter implements FileScannerListener, Runnable {
 		boolean success = false;
 		boolean finished = false;
 		boolean disconnected = false;
-		while (!finished) {
+		while (!finished && !cancelled) {
 			Message message = client.readMessage();
 			finished = (message == null) || (disconnected = client.isDisconnected());
 			if (firstMessage) {
@@ -556,7 +577,7 @@ public class ProjectInserter implements FileScannerListener, Runnable {
 			project.setEdition(newEdition);
 			project.setLastInsertionTime(System.currentTimeMillis());
 		}
-		fireProjectInsertFinished(success, disconnected ? new IOException("Connection terminated") : null);
+		fireProjectInsertFinished(success, cancelled ? new AbortedException() : (disconnected ? new IOException("Connection terminated") : null));
 	}
 
 	//