Author: chatellier Date: 2011-06-15 09:08:57 +0000 (Wed, 15 Jun 2011) New Revision: 3396 Log: Fix stream closing Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/SimulationInformation.java Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/SimulationInformation.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/SimulationInformation.java 2011-06-15 09:07:27 UTC (rev 3395) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/SimulationInformation.java 2011-06-15 09:08:57 UTC (rev 3396) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2007 - 2010 Ifremer, CodeLutin + * Copyright (C) 2007 - 2011 Ifremer, CodeLutin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -42,6 +42,7 @@ import java.util.Properties; import java.util.Set; +import org.apache.commons.io.IOUtils; import org.apache.commons.lang.time.DurationFormatUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -92,15 +93,17 @@ public SimulationInformation(File file) { this.file = file; if (file.exists()) { + FileReader reader = null; try { - FileReader reader = new FileReader(file); + reader = new FileReader(file); info.load(reader); - reader.close(); } catch (IOException eee) { if (log.isWarnEnabled()) { log.warn(_("isisfish.error.read.simulation", file .getPath()), eee); } + } finally { + IOUtils.closeQuietly(reader); } } } @@ -198,15 +201,17 @@ } protected void store() { + FileWriter writer = null; try { - FileWriter writer = new FileWriter(file); + writer = new FileWriter(file); info.store(writer, "Simulation Information"); - writer.close(); } catch (IOException eee) { if (log.isWarnEnabled()) { log.warn(_("isisfish.error.write.simulation", file.getPath()), eee); } + } finally { + IOUtils.closeQuietly(writer); } }