From: David ‘Bombe’ Roden <bombe@freenetproject.org>
Date: Sun, 22 Jun 2008 23:28:54 +0000 (+0200)
Subject: use Closer
X-Git-Tag: 0.4.12.2~20
X-Git-Url: https://git.pterodactylus.net/?a=commitdiff_plain;h=0123d73f009ae0bf018165f981eda16413129eae;p=jSite.git

use Closer
---

diff --git a/src/de/todesbaum/jsite/main/Configuration.java b/src/de/todesbaum/jsite/main/Configuration.java
index 100f175..cf4bca5 100644
--- a/src/de/todesbaum/jsite/main/Configuration.java
+++ b/src/de/todesbaum/jsite/main/Configuration.java
@@ -37,6 +37,7 @@ import java.util.Map.Entry;
 import de.todesbaum.jsite.application.FileOption;
 import de.todesbaum.jsite.application.Node;
 import de.todesbaum.jsite.application.Project;
+import de.todesbaum.util.io.Closer;
 import de.todesbaum.util.io.StreamCopier;
 import de.todesbaum.util.xml.SimpleXML;
 import de.todesbaum.util.xml.XML;
@@ -98,18 +99,8 @@ public class Configuration {
 			} catch (FileNotFoundException e) {
 			} catch (IOException e) {
 			} finally {
-				if (fileInputStream != null) {
-					try {
-						fileInputStream.close();
-					} catch (IOException ioe1) {
-					}
-				}
-				if (fileByteOutputStream != null) {
-					try {
-						fileByteOutputStream.close();
-					} catch (IOException ioe1) {
-					}
-				}
+				Closer.close(fileInputStream);
+				Closer.close(fileByteOutputStream);
 			}
 		}
 		rootNode = new SimpleXML("configuration");
@@ -133,18 +124,8 @@ public class Configuration {
 			return true;
 		} catch (IOException ioe1) {
 		} finally {
-			if (configurationInputStream != null) {
-				try {
-					configurationInputStream.close();
-				} catch (IOException ioe1) {
-				}
-			}
-			if (fileOutputStream != null) {
-				try {
-					fileOutputStream.close();
-				} catch (IOException ioe1) {
-				}
-			}
+			Closer.close(configurationInputStream);
+			Closer.close(fileOutputStream);
 		}
 		return false;
 	}