inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-10-15 15:02:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)

Browse Source 
125597 mward: ACE-5052: close stream


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@125779 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Raluca Munteanu
2016-04-26 12:19:38 +00:00
parent 118bed4ed5
commit 21563c3946
1 changed files with 38 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
source/java/org/alfresco/repo/content/transform/TikaPoweredContainerExtractor.java
View File

@@ -131,16 +131,19 @@ public class TikaPoweredContainerExtractor
// Get the contents
ContentReader reader = contentService.getReader(source, ContentModel.PROP_CONTENT);
TikaInputStream stream = TikaInputStream.get(reader.getContentInputStream());
// Build the recursing parser
Extractor handler = new Extractor(folder, mimetypes);
// Have Tika look for things
ParserContainerExtractor extractor = new ParserContainerExtractor(
parser, detector
);
InputStream wrappedInputStream = null;
TikaInputStream stream = null;
Extractor handler = null;
try {
wrappedInputStream = reader.getContentInputStream();
stream = TikaInputStream.get(wrappedInputStream);
// Build the recursing parser
handler = new Extractor(folder, mimetypes);
// Have Tika look for things
ParserContainerExtractor extractor = new ParserContainerExtractor(
parser, detector
);
logger.info("Beginning extraction of " + source.toString());
extractor.extract(stream, null, handler);
logger.info("Completed extraction of " + source.toString());
@@ -149,11 +152,32 @@ public class TikaPoweredContainerExtractor
} catch(IOException ie) {
throw new AlfrescoRuntimeException("Extraction Failed", ie);
}
// Tidy up
try {
stream.close();
} catch(IOException e) {}
finally
{
// Tidy up
if (stream != null)
{
try
{
stream.close();
}
catch (IOException error)
{
logger.debug("Error while closing stream.", error);
}
}
if (wrappedInputStream != null)
{
try
{
wrappedInputStream.close();
}
catch (IOException error)
{
logger.debug("Error while closing stream.", error);
}
}
}
// All done
return handler.extracted;