Author: onealj
Date: Fri Feb 17 09:53:49 2017
New Revision: 1783362
URL: http://svn.apache.org/viewvc?rev=1783362&view=rev
Log:
bug 59893: close open resources to prevent leaks
Modified:
poi/trunk/src/ooxml/testcases/org/apache/poi/poifs/crypt/TestDecryptor.java
poi/trunk/src/ooxml/testcases/org/apache/poi/poifs/crypt/TestEncryptor.java
poi/trunk/src/testcases/org/apache/poi/poifs/filesystem/ReaderWriter.java
Modified:
poi/trunk/src/ooxml/testcases/org/apache/poi/poifs/crypt/TestDecryptor.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/poifs/crypt/TestDecryptor.java?rev=1783362&r1=1783361&r2=1783362&view=diff
==============================================================================
--- poi/trunk/src/ooxml/testcases/org/apache/poi/poifs/crypt/TestDecryptor.java
(original)
+++ poi/trunk/src/ooxml/testcases/org/apache/poi/poifs/crypt/TestDecryptor.java
Fri Feb 17 09:53:49 2017
@@ -165,11 +165,14 @@ public class TestDecryptor {
@Test
public void test58616() throws IOException, GeneralSecurityException {
- POIFSFileSystem pfs = new POIFSFileSystem(new
FileInputStream(XSSFTestDataSamples.getSampleFile("58616.xlsx")));
+ FileInputStream fis = new
FileInputStream(XSSFTestDataSamples.getSampleFile("58616.xlsx"));
+ POIFSFileSystem pfs = new POIFSFileSystem(fis);
EncryptionInfo info = new EncryptionInfo(pfs);
Decryptor dec = Decryptor.getInstance(info);
//dec.verifyPassword(null);
dec.getDataStream(pfs);
+ pfs.close();
+ fis.close();
}
@Test
Modified:
poi/trunk/src/ooxml/testcases/org/apache/poi/poifs/crypt/TestEncryptor.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/poifs/crypt/TestEncryptor.java?rev=1783362&r1=1783361&r2=1783362&view=diff
==============================================================================
--- poi/trunk/src/ooxml/testcases/org/apache/poi/poifs/crypt/TestEncryptor.java
(original)
+++ poi/trunk/src/ooxml/testcases/org/apache/poi/poifs/crypt/TestEncryptor.java
Fri Feb 17 09:53:49 2017
@@ -151,7 +151,8 @@ public class TestEncryptor {
ByteArrayOutputStream bos = new ByteArrayOutputStream();
fs.writeFilesystem(bos);
-
+ fs.close();
+
nfs = new NPOIFSFileSystem(new
ByteArrayInputStream(bos.toByteArray()));
infoActual = new EncryptionInfo(nfs.getRoot());
Decryptor decActual = Decryptor.getInstance(infoActual);
@@ -297,11 +298,13 @@ public class TestEncryptor {
enc.confirmPassword("password");
OutputStream os = enc.getDataStream(fs);
pkg.save(os);
+ os.close();
pkg.revert();
// Save the resulting OLE2 document, and re-open it
ByteArrayOutputStream baos = new ByteArrayOutputStream();
fs.writeFilesystem(baos);
+ fs.close();
ByteArrayInputStream bais = new
ByteArrayInputStream(baos.toByteArray());
NPOIFSFileSystem inpFS = new NPOIFSFileSystem(bais);
@@ -318,6 +321,9 @@ public class TestEncryptor {
assertNotNull(inpPkg.getPackageProperties());
assertNotNull(inpPkg.getPackageProperties().getLanguageProperty());
assertNull(inpPkg.getPackageProperties().getLanguageProperty().getValue());
+
+ inpPkg.close();
+ inpFS.close();
}
@Test
@@ -340,7 +346,8 @@ public class TestEncryptor {
assertTrue(b);
// do some strange things with it ;)
- XWPFDocument docx = new XWPFDocument(d.getDataStream(fs));
+ InputStream docIS = d.getDataStream(fs);
+ XWPFDocument docx = new XWPFDocument(docIS);
docx.getParagraphArray(0).insertNewRun(0).setText("POI was here! All
your base are belong to us!");
docx.getParagraphArray(0).insertNewRun(1).addBreak();
@@ -348,6 +355,8 @@ public class TestEncryptor {
Encryptor e = encInfo.getEncryptor();
e.confirmPassword("AYBABTU");
docx.write(e.getDataStream(fs));
+ docx.close();
+ docIS.close();
docx.close();
fs.close();
Modified:
poi/trunk/src/testcases/org/apache/poi/poifs/filesystem/ReaderWriter.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/poifs/filesystem/ReaderWriter.java?rev=1783362&r1=1783361&r2=1783362&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/poifs/filesystem/ReaderWriter.java
(original)
+++ poi/trunk/src/testcases/org/apache/poi/poifs/filesystem/ReaderWriter.java
Fri Feb 17 09:53:49 2017
@@ -44,7 +44,7 @@ public class ReaderWriter
private final DirectoryEntry root;
// keys are DocumentDescriptors, values are byte[]s
- private final Map<DocumentDescriptor, byte[]> dataMap;
+ private final Map<DocumentDescriptor, byte[]> dataMap;
/**
* Constructor ReaderWriter
@@ -93,6 +93,8 @@ public class ReaderWriter
filesystem.writeFilesystem(ostream);
ostream.close();
+
+ filesystem.close();
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
