X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FSoneDownloader.java;h=8e9db39d555e5bd5390f93142e61c43c4c0b036b;hp=b7871dd012092ac8ba9bbdda407098656cd7d874;hb=69dae8af837896f0f8d932d7936bbf92e101f1e2;hpb=d88fbc4ce31eba494a498c3a2629f30a4a07bedd

diff --git a/src/main/java/net/pterodactylus/sone/core/SoneDownloader.java b/src/main/java/net/pterodactylus/sone/core/SoneDownloader.java
index b7871dd..8e9db39 100644
--- a/src/main/java/net/pterodactylus/sone/core/SoneDownloader.java
+++ b/src/main/java/net/pterodactylus/sone/core/SoneDownloader.java
@@ -117,17 +117,18 @@ public class SoneDownloader extends AbstractService {
 	/**
 	 * Parses a Sone from a fetch result.
 	 *
-	 * @param sone
+	 * @param originalSone
 	 *            The sone to parse, or {@code null} if the Sone is yet unknown
 	 * @param fetchResult
 	 *            The fetch result
 	 * @return The parsed Sone, or {@code null} if the Sone could not be parsed
 	 */
-	public Sone parseSone(Sone sone, FetchResult fetchResult) {
-		logger.log(Level.FINEST, "Persing FetchResult (%d bytes, %s) for %s…", new Object[] { fetchResult.size(), fetchResult.getMimeType(), sone });
+	public Sone parseSone(Sone originalSone, FetchResult fetchResult) {
+		logger.log(Level.FINEST, "Persing FetchResult (%d bytes, %s) for %s…", new Object[] { fetchResult.size(), fetchResult.getMimeType(), originalSone });
 		/* TODO - impose a size limit? */
 		InputStream xmlInputStream = null;
 		Bucket xmlBucket = null;
+		Sone sone;
 		try {
 			xmlBucket = fetchResult.asBucket();
 			xmlInputStream = xmlBucket.getInputStream();
@@ -137,19 +138,20 @@ public class SoneDownloader extends AbstractService {
 				soneXml = SimpleXML.fromDocument(document);
 			} catch (NullPointerException npe1) {
 				/* for some reason, invalid XML can cause NPEs. */
-				logger.log(Level.WARNING, "XML for Sone " + sone + " can not be parsed!", npe1);
+				logger.log(Level.WARNING, "XML for Sone " + originalSone + " can not be parsed!", npe1);
 				return null;
 			}
 
 			/* check ID. */
 			String soneId = soneXml.getValue("id", null);
-			if ((sone != null) && !sone.getId().equals(soneId)) {
+			if ((originalSone != null) && !originalSone.getId().equals(soneId)) {
 				/* TODO - mark Sone as bad. */
-				logger.log(Level.WARNING, "Downloaded ID for Sone %s (%s) does not match known ID (%s)!", new Object[] { sone, sone.getId(), soneId });
+				logger.log(Level.WARNING, "Downloaded ID for Sone %s (%s) does not match known ID (%s)!", new Object[] { originalSone, originalSone.getId(), soneId });
 				return null;
 			}
 
 			/* load Sone from core. */
+			sone = originalSone;
 			if (sone == null) {
 				sone = core.getSone(soneId);
 			}
@@ -238,7 +240,7 @@ public class SoneDownloader extends AbstractService {
 				sone.setModificationCounter(0);
 			}
 		} catch (IOException ioe1) {
-			logger.log(Level.WARNING, "Could not read XML file from " + sone + "!", ioe1);
+			logger.log(Level.WARNING, "Could not read XML file from " + originalSone + "!", ioe1);
 			return null;
 		} finally {
 			if (xmlBucket != null) {