r27275 - trunk/freenet/src/freenet/clients/http

[email protected] Fri, 24 Apr 2009 00:38:10 +0000
Newsgroups gmane.network.freenet.cvs
Message-ID <[email protected]>
Author: toad
Date: 2009-04-24 00:38:10 +0000 (Fri, 24 Apr 2009)
New Revision: 27275

Modified:
   trunk/freenet/src/freenet/clients/http/FProxyToadlet.java
Log:
Fix polling forever if we get a FetchException on creation


Modified: trunk/freenet/src/freenet/clients/http/FProxyToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/FProxyToadlet.java	2009-04-24 00:37:02 UTC (rev 27274)
+++ trunk/freenet/src/freenet/clients/http/FProxyToadlet.java	2009-04-24 00:38:10 UTC (rev 27275)
@@ -499,7 +499,13 @@
 		FProxyFetchResult fr = null;
 		if(logMINOR) Logger.minor(this, "UA = "+ua+" accept = "+accept);
 		if(isBrowser(ua) && (accept == null || accept.indexOf("text/html") > -1)) {
-			FProxyFetchWaiter fetch = fetchTracker.makeFetcher(key, maxSize);
+			FProxyFetchWaiter fetch = null;
+			try {
+				fetch = fetchTracker.makeFetcher(key, maxSize);
+			} catch (FetchException e) {
+				fe = fr.failed;
+			}
+			if(fetch != null)
 			while(true) {
 			fr = fetch.getResult();
 			if(fr.hasData()) {