Skip to content

ensure that FileInputStream is closed to avoid resource leakage #716

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Apr 27, 2017
Merged

ensure that FileInputStream is closed to avoid resource leakage #716

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6d59aa8
ensure that FileInputStream is closed to avoid resource leakage
hansenmc Mar 31, 2017
3649147
remove unnecessary code closing a FileInputStream already closed
hansenmc Apr 27, 2017
bdf6c0b
change indent to 2 spaces
hansenmc Apr 27, 2017
6fcc174
additional whitespace cleanup
hansenmc Apr 27, 2017
3aac663
Merge branch 'develop' of https://github.com/marklogic/java-client-ap…
hansenmc Apr 27, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions src/main/java/com/marklogic/client/impl/HandleAccessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,9 +124,7 @@ static public String contentAsString(AbstractWriteHandle handle) {
}
stringContent = sb.toString();
}
if ( content instanceof File ) {
((FileInputStream) content).close();
}

if ( stringContent == null ) {
throw new UnsupportedOperationException("contentAsString only supports handles with sendContent() " +
"of type String, OutputStreamSender, byte[], File, or InputStream");
Expand Down
16 changes: 16 additions & 0 deletions src/test/java/com/marklogic/client/test/HandleAccessorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,10 @@
package com.marklogic.client.test;

import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;

import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
import java.io.StringReader;
import java.net.URISyntaxException;
Expand All @@ -32,7 +34,10 @@
import com.marklogic.client.io.InputStreamHandle;
import com.marklogic.client.io.ReaderHandle;
import com.marklogic.client.io.StringHandle;
import java.io.InputStream;
public class HandleAccessorTest {
public static boolean fileInputStreamWasClosed;

@Test
public void testContentAsString() throws URISyntaxException, IOException {
// I'm purposely using a string with a non-ascii character to test
Expand All @@ -50,5 +55,16 @@ public void testContentAsString() throws URISyntaxException, IOException {
HandleAccessor.contentAsString(new FileHandle(new File(filePath.toURI()))));
assertEquals("InputStream content mismatch", hola,
HandleAccessor.contentAsString(new InputStreamHandle(filePath.openStream())));

InputStream fileInputStream = new FileInputStream(new File(filePath.toURI())) {
@Override
public void close() throws IOException {
super.close();
HandleAccessorTest.fileInputStreamWasClosed = true;
}
};
assertEquals("InputStream content mismatch", hola,
HandleAccessor.contentAsString(new InputStreamHandle(fileInputStream)));
assertTrue(this.fileInputStreamWasClosed);
}
}