X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FCore.java;h=76881ef78a6cf408c93236784b790979f3371dce;hb=0f1d38f9011a73939437b6158b8c8bdd1a3dc5eb;hp=7a0ec9c673c219b6f1ceb5166eecad7e9c8c1466;hpb=b1660609f6574ed43afd61d332be9f3764900405;p=Sone.git

diff --git a/src/main/java/net/pterodactylus/sone/core/Core.java b/src/main/java/net/pterodactylus/sone/core/Core.java
index 7a0ec9c..76881ef 100644
--- a/src/main/java/net/pterodactylus/sone/core/Core.java
+++ b/src/main/java/net/pterodactylus/sone/core/Core.java
@@ -399,6 +399,9 @@ public class Core extends AbstractService {
 				try {
 					FreenetURI realRequestUri = new FreenetURI(requestUri).setMetaString(new String[] { "sone.xml" });
 					FetchResult fetchResult = freenetInterface.fetchUri(realRequestUri);
+					if (fetchResult == null) {
+						return;
+					}
 					Sone parsedSone = soneDownloader.parseSone(null, fetchResult, realRequestUri);
 					if (parsedSone != null) {
 						if (insertUri != null) {
@@ -428,10 +431,19 @@ public class Core extends AbstractService {
 			@SuppressWarnings("synthetic-access")
 			public void run() {
 				FreenetURI realRequestUri = sone.getRequestUri().setMetaString(new String[] { "sone.xml" });
-				FetchResult fetchResult = freenetInterface.fetchUri(realRequestUri);
-				Sone parsedSone = soneDownloader.parseSone(sone, fetchResult, realRequestUri);
-				if (parsedSone != null) {
-					addSone(parsedSone);
+				setSoneStatus(sone, SoneStatus.downloading);
+				try {
+					FetchResult fetchResult = freenetInterface.fetchUri(realRequestUri);
+					if (fetchResult == null) {
+						/* TODO - mark Sone as bad. */
+						return;
+					}
+					Sone parsedSone = soneDownloader.parseSone(sone, fetchResult, realRequestUri);
+					if (parsedSone != null) {
+						addSone(parsedSone);
+					}
+				} finally {
+					setSoneStatus(sone, SoneStatus.idle);
 				}
 			}
 		}, "Sone Downloader").start();