From: David ‘Bombe’ Roden <bombe@pterodactylus.net>
Date: Sat, 16 Oct 2010 02:59:09 +0000 (+0200)
Subject: In case of a permanent redirect, follow.
X-Git-Tag: 0.1-RC1~287
X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=commitdiff_plain;h=b2f452ea2e5fdc2771e8f16139eb599b91ab9a38

In case of a permanent redirect, follow.
---

diff --git a/src/main/java/net/pterodactylus/sone/core/FreenetInterface.java b/src/main/java/net/pterodactylus/sone/core/FreenetInterface.java
index d823cc1..2c98a7e 100644
--- a/src/main/java/net/pterodactylus/sone/core/FreenetInterface.java
+++ b/src/main/java/net/pterodactylus/sone/core/FreenetInterface.java
@@ -86,16 +86,21 @@ public class FreenetInterface extends AbstractService {
 	 * @return The result of the fetch, or {@code null} if an error occured
 	 */
 	public FetchResult fetchUri(FreenetURI uri) {
-		logger.entering(FreenetInterface.class.getName(), "fetchUri(FreenetURI)", uri);
 		FetchResult fetchResult = null;
-		try {
-			fetchResult = client.fetch(uri);
-		} catch (FetchException fe1) {
-			logger.log(Level.WARNING, "Could not fetch “" + uri + "”!", fe1);
-		} finally {
-			logger.exiting(FreenetInterface.class.getName(), "fetchUri(FreenetURI)", fetchResult);
+		FreenetURI currentUri = new FreenetURI(uri);
+		while (true) {
+			try {
+				fetchResult = client.fetch(currentUri);
+				return fetchResult;
+			} catch (FetchException fe1) {
+				if (fe1.getMode() == FetchException.PERMANENT_REDIRECT) {
+					currentUri = fe1.newURI;
+					continue;
+				}
+				logger.log(Level.WARNING, "Could not fetch “" + uri + "”!", fe1);
+				return null;
+			}
 		}
-		return fetchResult;
 	}
 
 	/**