X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2Fpage%2FPageToadlet.java;h=fc5833994556e7afbcd5cdd24be4a68770df85a8;hb=1deeb8285b1347baa98994b10322b548fd71a449;hp=1d2a2db48adb375ad934c3e76aca4dc371366c83;hpb=50ce65f69e49ed10abeedaeb6615ffb37a0c0772;p=Sone.git

diff --git a/src/main/java/net/pterodactylus/sone/web/page/PageToadlet.java b/src/main/java/net/pterodactylus/sone/web/page/PageToadlet.java
index 1d2a2db..fc58339 100644
--- a/src/main/java/net/pterodactylus/sone/web/page/PageToadlet.java
+++ b/src/main/java/net/pterodactylus/sone/web/page/PageToadlet.java
@@ -1,5 +1,5 @@
 /*
- * Sone - PageToadlet.java - Copyright © 2010–2012 David Roden
+ * Sone - PageToadlet.java - Copyright © 2010–2013 David Roden
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -18,12 +18,14 @@
 package net.pterodactylus.sone.web.page;
 
 import java.io.IOException;
+import java.io.OutputStream;
 import java.net.URI;
 
 import net.pterodactylus.util.web.Header;
 import net.pterodactylus.util.web.Method;
 import net.pterodactylus.util.web.Page;
 import net.pterodactylus.util.web.Response;
+
 import freenet.client.HighLevelSimpleClient;
 import freenet.clients.http.LinkEnabledCallback;
 import freenet.clients.http.LinkFilterExceptedToadlet;
@@ -144,21 +146,28 @@ public class PageToadlet extends Toadlet implements LinkEnabledCallback, LinkFil
 	 */
 	private void handleRequest(FreenetRequest pageRequest) throws IOException, ToadletContextClosedException {
 		Bucket pageBucket = null;
+		OutputStream pageBucketOutputStream = null;
+		Response pageResponse;
 		try {
 			pageBucket = pageRequest.getToadletContext().getBucketFactory().makeBucket(-1);
-			Response pageResponse = new Response(pageBucket.getOutputStream());
-			pageResponse = page.handleRequest(pageRequest, pageResponse);
-			MultiValueTable<String, String> headers = new MultiValueTable<String, String>();
-			if (pageResponse.getHeaders() != null) {
-				for (Header header : pageResponse.getHeaders()) {
-					for (String value : header) {
-						headers.put(header.getName(), value);
-					}
+			pageBucketOutputStream = pageBucket.getOutputStream();
+			pageResponse = page.handleRequest(pageRequest, new Response(pageBucketOutputStream));
+		} catch (IOException ioe1) {
+			Closer.close(pageBucket);
+			throw ioe1;
+		} finally {
+			Closer.close(pageBucketOutputStream);
+		}
+		MultiValueTable<String, String> headers = new MultiValueTable<String, String>();
+		if (pageResponse.getHeaders() != null) {
+			for (Header header : pageResponse.getHeaders()) {
+				for (String value : header) {
+					headers.put(header.getName(), value);
 				}
 			}
+		}
+		try {
 			writeReply(pageRequest.getToadletContext(), pageResponse.getStatusCode(), pageResponse.getContentType(), pageResponse.getStatusText(), headers, pageBucket);
-		} catch (Throwable t1) {
-			writeInternalError(t1, pageRequest.getToadletContext());
 		} finally {
 			Closer.close(pageBucket);
 		}
@@ -184,7 +193,7 @@ public class PageToadlet extends Toadlet implements LinkEnabledCallback, LinkFil
 	 */
 	@Override
 	public boolean isLinkExcepted(URI link) {
-		return (page instanceof FreenetPage) ? ((FreenetPage) page).isLinkExcepted(link) : false;
+		return (page instanceof FreenetPage) && ((FreenetPage) page).isLinkExcepted(link);
 	}
 
 }