From: <fg...@us...> - 2011-05-22 18:01:58
|
Revision: 3485 http://openutils.svn.sourceforge.net/openutils/?rev=3485&view=rev Author: fgiust Date: 2011-05-22 18:01:52 +0000 (Sun, 22 May 2011) Log Message: ----------- MEDIA-225 safer catch of exceptions during pdf preview generation Modified Paths: -------------- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/DocumentTypeHandler.java Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/DocumentTypeHandler.java =================================================================== --- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/DocumentTypeHandler.java 2011-05-22 17:56:02 UTC (rev 3484) +++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/DocumentTypeHandler.java 2011-05-22 18:01:52 UTC (rev 3485) @@ -124,16 +124,26 @@ if (StringUtils.equalsIgnoreCase(data.getAttribute(FileProperties.EXTENSION), "pdf")) { - String filename = data.getAttribute(FileProperties.PROPERTY_FILENAME) + ".png"; - - InputStream stream = data.getStream(); try { - createPdfPreview(media, stream, filename); + String filename = data.getAttribute(FileProperties.PROPERTY_FILENAME) + ".png"; + + InputStream stream = data.getStream(); + try + { + createPdfPreview(media, stream, filename); + } + finally + { + IOUtils.closeQuietly(stream); + } } - finally + catch (Throwable e) { - IOUtils.closeQuietly(stream); + log.warn("Unable to generate a preview for {} due to a {}: {}", new Object[]{ + media.getHandle(), + e.getClass().getName(), + e.getMessage() }); } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |