Author: vbriand Date: 2011-02-24 11:30:30 +0100 (Thu, 24 Feb 2011) New Revision: 214 Url: http://chorem.org/repositories/revision/bow/214 Log: The BufferedWriter is now closed even if an exception occurs Modified: trunk/src/main/java/org/chorem/bow/action/ExportBookmarksAction.java Modified: trunk/src/main/java/org/chorem/bow/action/ExportBookmarksAction.java =================================================================== --- trunk/src/main/java/org/chorem/bow/action/ExportBookmarksAction.java 2011-02-24 10:16:35 UTC (rev 213) +++ trunk/src/main/java/org/chorem/bow/action/ExportBookmarksAction.java 2011-02-24 10:30:30 UTC (rev 214) @@ -33,6 +33,7 @@ import javax.servlet.http.HttpServletResponse; +import org.apache.commons.io.IOUtils; import org.apache.struts2.interceptor.ServletResponseAware; import org.chorem.bow.BowBookmark; import org.chorem.bow.BookmarkUtils; @@ -70,17 +71,20 @@ .eq(BowBookmark.FQ_FIELD_BOWBOOKMARK_BOWUSER, user.getWikittyId()).criteria(); List<BowBookmark> bookmarks = proxy.findAllByCriteria(BowBookmark.class, criteria).getAll(); String export = BookmarkUtils.getExportHtmlBookmark(bookmarks); - + BufferedWriter out = null; + try { File tmp = File.createTempFile("bookmarks", "tmp.html"); tmp.deleteOnExit(); - BufferedWriter out = new BufferedWriter(new FileWriter(tmp)); + out = new BufferedWriter(new FileWriter(tmp)); out.write(export); - out.close(); + inputStream = new FileInputStream(tmp); } catch (IOException e) { - log.error("Error when exporting bookmarks to HTML : " + e.getMessage()); + log.error("Error when exporting bookmarks to HTML : " + e.getMessage(), e); + } finally { + IOUtils.closeQuietly(out); } return SUCCESS; }