mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-06-30 18:15:39 +00:00
84058: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud) 83799: MNT-12238: Merged DEV 4.2-BUG-FIX (4.2.4) to V4.2-BUG-FIX (4.2.4) MNT-12238: Merged 4.1-BUG-FIX (4.1.10) to V4.2-BUG-FIX (4.2.4) 80291: Merged V4.1.6 (4.1.6.21) to V4.1-BUG-FIX (4.1.10) 77378: Merged DEV PATCHES/V4.1.6 (19) to PATCHES/V4.1.6 (20) 76649: MNT-11823: Upload of PPTX causes very high memory usage leading to system instability - Patch from MNT-577 has been combined with new changes to avoid hanging of analyzing complicated PPTX documents. The fix just disables reading the entire contents of the complicated document. POI metadata extractor may be switched to standard behavior or reconfigured, using the following new properties: content.transformer.Poi.poiFootnotesLimit, content.transformer.Poi.poiExtractPropertiesOnly and content-services-context.xml/extracter.Poi/poiAllowableXslfRelationshipTypes 77379: MNT-11823: Upload of PPTX causes very high memory usage leading to system instability Test and the test data for MNT-577 have been added. Test for MNT-11823 has also been added. But this test is commented because the test data (appropriate PPTX document) is not currently available. Getters for POI specific properties have been added to 'PoiMetadataExtracter' for tests. Also 'afterPropertiesSet()' logic has been a bit modified to allow setting 'false' value for 'poiExtractPropertiesOnly' parameter 77561: MNT-11823: Upload of PPTX causes very high memory usage leading to system instability Fix for https://bamboo.alfresco.com/bamboo/browse/HF-PATCH416-126 build failure. POI extractor and transformer properties of 'AlfrescoPoiPatchUtils' have been isolated from each other using context. Each extractor or transformer now has its own context or uses the default context. Properties of the default context allow parsing the entire contents of XLSF documents. And footnotes limit is 50. Property names have not been changed, but currently 'content-services-context.xml/extracter.Poi/poiAllowableXslfRelationshipTypes=null' does not lead to 'content.transformer.Poi.poiExtractPropertiesOnly=false'. I. e., this list may be empty. 'PoiMetadataExtracterTest' test has been modified in accordance with the introduced changes. 'poi-OOXML-3.9-beta1-20121109.jar' has been renamed to 'poi-OOXML-3.9-beta1-20121109-patched.jar' 79180: MNT-12043: CLONE - Upload of PPTX causes very high memory usage leading to system instability Timeout mechanism has been added to content transformers. Timeout configuration options have been added. Also mechanism to close streams after 'TimoutException' has been added to transformers and metadata extractors. Also timeout mechanism for input streams has been enabled in 'TikaPoweredContentTransformer' 79268: MNT-12043: CLONE - Upload of PPTX causes very high memory usage leading to system instability Fix for the https://bamboo.alfresco.com/bamboo/browse/HF-PATCH416-133 build failure and comments of the review https://fisheye.alfresco.com/cru/CR-100#CFR-1184. The new test has been added into 'PoiOOXMLContentTransformerTest.testMnt12043()' to check out the newly added timeout mechanism 79290: MNT-12043: CLONE - Upload of PPTX causes very high memory usage leading to system instability - Removed methods and properties that are no longer needed 79327: MNT-12043: CLONE - Upload of PPTX causes very high memory usage leading to system instability - Increased ADDITIONAL_PROCESSING_TIME to 1500ms to try and avoid a new intermittent test failure. 83885: MNT-12238 Bring Maven POM file in sync with latest patched version of poi-ooxml git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@84627 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
218 lines
5.2 KiB
Java
218 lines
5.2 KiB
Java
/*
|
|
* Copyright (C) 2005-2014 Alfresco Software Limited.
|
|
*
|
|
* This file is part of Alfresco
|
|
*
|
|
* Alfresco is free software: you can redistribute it and/or modify
|
|
* it under the terms of the GNU Lesser General Public License as published by
|
|
* the Free Software Foundation, either version 3 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* Alfresco is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU Lesser General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU Lesser General Public License
|
|
* along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
package org.alfresco.repo.content;
|
|
|
|
import java.io.Closeable;
|
|
import java.io.File;
|
|
import java.io.InputStream;
|
|
import java.io.OutputStream;
|
|
import java.nio.channels.FileChannel;
|
|
import java.nio.channels.WritableByteChannel;
|
|
import java.util.Locale;
|
|
|
|
import org.alfresco.service.cmr.repository.ContentData;
|
|
import org.alfresco.service.cmr.repository.ContentIOException;
|
|
import org.alfresco.service.cmr.repository.ContentReader;
|
|
import org.alfresco.service.cmr.repository.ContentStreamListener;
|
|
import org.alfresco.service.cmr.repository.ContentWriter;
|
|
|
|
/**
|
|
* Proxy for {@link ContentWriter} which captures {@link OutputStream} or {@link WritableByteChannel} to introduce a possibility of releasing captured resource
|
|
*
|
|
* @author Dmitry Velichkevich
|
|
* @see ContentWriter
|
|
* @see AbstractStreamAwareProxy
|
|
*/
|
|
public class StreamAwareContentWriterProxy extends AbstractStreamAwareProxy implements ContentWriter
|
|
{
|
|
private ContentWriter delegatee;
|
|
|
|
private Closeable releaseableResource;
|
|
|
|
public StreamAwareContentWriterProxy(ContentWriter delegator)
|
|
{
|
|
this.delegatee = delegator;
|
|
}
|
|
|
|
@Override
|
|
public OutputStream getContentOutputStream() throws ContentIOException
|
|
{
|
|
OutputStream result = delegatee.getContentOutputStream();
|
|
|
|
if (null == releaseableResource)
|
|
{
|
|
releaseableResource = result;
|
|
}
|
|
|
|
return result;
|
|
}
|
|
|
|
@Override
|
|
public FileChannel getFileChannel(boolean truncate) throws ContentIOException
|
|
{
|
|
FileChannel result = delegatee.getFileChannel(truncate);
|
|
|
|
if (null == releaseableResource)
|
|
{
|
|
releaseableResource = result;
|
|
}
|
|
|
|
return result;
|
|
}
|
|
|
|
@Override
|
|
public ContentReader getReader() throws ContentIOException
|
|
{
|
|
return delegatee.getReader();
|
|
}
|
|
|
|
@Override
|
|
public WritableByteChannel getWritableChannel() throws ContentIOException
|
|
{
|
|
WritableByteChannel result = delegatee.getWritableChannel();
|
|
|
|
if (null == releaseableResource)
|
|
{
|
|
releaseableResource = result;
|
|
}
|
|
|
|
return result;
|
|
}
|
|
|
|
@Override
|
|
public void guessEncoding()
|
|
{
|
|
delegatee.guessEncoding();
|
|
}
|
|
|
|
@Override
|
|
public void guessMimetype(String filename)
|
|
{
|
|
delegatee.guessMimetype(filename);
|
|
}
|
|
|
|
@Override
|
|
public boolean isClosed()
|
|
{
|
|
return delegatee.isClosed();
|
|
}
|
|
|
|
@Override
|
|
public void putContent(ContentReader reader) throws ContentIOException
|
|
{
|
|
delegatee.putContent(reader);
|
|
}
|
|
|
|
@Override
|
|
public void putContent(InputStream is) throws ContentIOException
|
|
{
|
|
delegatee.putContent(is);
|
|
}
|
|
|
|
@Override
|
|
public void putContent(File file) throws ContentIOException
|
|
{
|
|
delegatee.putContent(file);
|
|
}
|
|
|
|
@Override
|
|
public void putContent(String content) throws ContentIOException
|
|
{
|
|
delegatee.putContent(content);
|
|
}
|
|
|
|
@Override
|
|
public void addListener(ContentStreamListener listener)
|
|
{
|
|
delegatee.addListener(listener);
|
|
}
|
|
|
|
@Override
|
|
public ContentData getContentData()
|
|
{
|
|
return delegatee.getContentData();
|
|
}
|
|
|
|
@Override
|
|
public String getContentUrl()
|
|
{
|
|
return delegatee.getContentUrl();
|
|
}
|
|
|
|
@Override
|
|
public String getEncoding()
|
|
{
|
|
return delegatee.getEncoding();
|
|
}
|
|
|
|
@Override
|
|
public Locale getLocale()
|
|
{
|
|
return delegatee.getLocale();
|
|
}
|
|
|
|
@Override
|
|
public String getMimetype()
|
|
{
|
|
return delegatee.getMimetype();
|
|
}
|
|
|
|
@Override
|
|
public long getSize()
|
|
{
|
|
return delegatee.getSize();
|
|
}
|
|
|
|
@Override
|
|
public boolean isChannelOpen()
|
|
{
|
|
return delegatee.isChannelOpen();
|
|
}
|
|
|
|
@Override
|
|
public void setEncoding(String encoding)
|
|
{
|
|
delegatee.setEncoding(encoding);
|
|
}
|
|
|
|
@Override
|
|
public void setLocale(Locale locale)
|
|
{
|
|
delegatee.setLocale(locale);
|
|
}
|
|
|
|
@Override
|
|
public void setMimetype(String mimetype)
|
|
{
|
|
delegatee.setMimetype(mimetype);
|
|
}
|
|
|
|
@Override
|
|
public boolean canBeClosed()
|
|
{
|
|
return delegatee.isChannelOpen();
|
|
}
|
|
|
|
@Override
|
|
public Closeable getStream()
|
|
{
|
|
return releaseableResource;
|
|
}
|
|
}
|