From 30b88b40580bdf0c35e0aef3f7ab5bfe74901e85 Mon Sep 17 00:00:00 2001 From: Andreas Beeker Date: Mon, 6 Jun 2016 23:34:17 +0000 Subject: [PATCH] close resources git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1747092 13f79535-47bb-0310-9956-ffa450edef68 --- src/java/org/apache/poi/POIDocument.java | 73 ++++++++++++------------ 1 file changed, 38 insertions(+), 35 deletions(-) diff --git a/src/java/org/apache/poi/POIDocument.java b/src/java/org/apache/poi/POIDocument.java index aa8ccb3784..7235958ddf 100644 --- a/src/java/org/apache/poi/POIDocument.java +++ b/src/java/org/apache/poi/POIDocument.java @@ -70,18 +70,24 @@ public abstract class POIDocument { /** * Constructs from an old-style OPOIFS + * + * @param fs the filesystem the document is read from */ protected POIDocument(OPOIFSFileSystem fs) { this(fs.getRoot()); } /** * Constructs from an old-style OPOIFS + * + * @param fs the filesystem the document is read from */ protected POIDocument(NPOIFSFileSystem fs) { this(fs.getRoot()); } /** * Constructs from the default POIFS + * + * @param fs the filesystem the document is read from */ protected POIDocument(POIFSFileSystem fs) { this(fs.getRoot()); @@ -180,49 +186,46 @@ public abstract class POIDocument { DirectoryNode dirNode = directory; NPOIFSFileSystem encPoifs = null; - if (encryptionInfo != null) { - try { + String step = "getting"; + try { + if (encryptionInfo != null) { + step = "getting encrypted"; InputStream is = encryptionInfo.getDecryptor().getDataStream(directory); - encPoifs = new NPOIFSFileSystem(is); - is.close(); - dirNode = encPoifs.getRoot(); - } catch (Exception e) { - logger.log(POILogger.ERROR, "Error getting encrypted property set with name " + setName, e); + try { + encPoifs = new NPOIFSFileSystem(is); + dirNode = encPoifs.getRoot(); + } finally { + is.close(); + } + } + + //directory can be null when creating new documents + if (dirNode == null || !dirNode.hasEntry(setName)) { return null; } - } - - //directory can be null when creating new documents - if (dirNode == null || !dirNode.hasEntry(setName)) - return null; - - DocumentInputStream dis; - try { + // Find the entry, and get an input stream for it - dis = dirNode.createDocumentInputStream( dirNode.getEntry(setName) ); - } catch(IOException ie) { - // Oh well, doesn't exist - logger.log(POILogger.WARN, "Error getting property set with name " + setName + "\n" + ie); + step = "getting"; + DocumentInputStream dis = dirNode.createDocumentInputStream( dirNode.getEntry(setName) ); + try { + // Create the Property Set + step = "creating"; + return PropertySetFactory.create(dis); + } finally { + dis.close(); + } + } catch (Exception e) { + logger.log(POILogger.WARN, "Error "+step+" property set with name " + setName, e); return null; - } - - try { - // Create the Property Set - PropertySet set = PropertySetFactory.create(dis); - // Tidy up if needed + } finally { if (encPoifs != null) { - encPoifs.close(); + try { + encPoifs.close(); + } catch(IOException e) { + logger.log(POILogger.WARN, "Error closing encrypted property poifs", e); + } } - // Return the properties - return set; - } catch(IOException ie) { - // Must be corrupt or something like that - logger.log(POILogger.WARN, "Error creating property set with name " + setName + "\n" + ie); - } catch(org.apache.poi.hpsf.HPSFException he) { - // Oh well, doesn't exist - logger.log(POILogger.WARN, "Error creating property set with name " + setName + "\n" + he); } - return null; } /** -- 2.39.5