inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)

Browse Source 
85648: MNT-12422: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
      85647: Merged V4.1-BUG-FIX (4.1.10) to V4.2-BUG-FIX (4.2.4)
         85646: MNT-11823: Upload of PPTX causes very high memory usage leading to system instability
            - Need to reduce the timeout (50ms -> 30ms) of the test as it failed on HEAD-BUG-FIX after a new version of POI was merged from V4.2-BUG-FIX
              as it completed the transform in 52ms which then tripped over the check that its should not have completed.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@85678 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2014-09-25 06:14:01 +00:00
parent f29481e5cc
commit e507f9ea55
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
source/test-java/org/alfresco/repo/content/transform/PoiOOXMLContentTransformerTest.java
View File

@@ -40,7 +40,7 @@ import org.alfresco.service.cmr.repository.TransformationOptions;
*/
public class PoiOOXMLContentTransformerTest extends AbstractContentTransformerTest
{
private static final int SMALL_TIMEOUT = 50;
private static final int SMALL_TIMEOUT = 30;
private static final int ADDITIONAL_PROCESSING_TIME = 1500;
@@ -133,6 +133,7 @@ public class PoiOOXMLContentTransformerTest extends AbstractContentTransformerTe
try
{
transformer.transform(sourceReader, tempWriter);
// should not get here unless transform is too fast
long transformationTime = System.currentTimeMillis() - startTime;
fail("Content transformation took " + transformationTime + " ms, but should have failed with a timeout at " + SMALL_TIMEOUT + " ms");
}