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

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

Browse Source 
105991: Merged 5.0.N (5.0.3) to HEAD-BUG-FIX (5.1/Cloud)
      105915: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.3)
         105898: MNT-13901 TransformationOptions Timeout Can Not Easily Be Set
            - Fix "TransformationOptionPair.setMax(long max) and TransformationOptionPair.setLimit(long limit) so that they don't
              clear the other half of the pair when the value being set is < 0 (unset).
            - Unit tests added
            - Added comments about how the 'transformer' code builds up limits to include defaults.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@106013 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2015-06-12 10:33:47 +00:00
parent b249a2d9b9
commit 3a8602f46c
4 changed files with 50 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/java/org/alfresco/repo/content/transform/TransformerConfigLimits.java
View File

@@ -179,6 +179,8 @@ public class TransformerConfigLimits extends TransformerPropertyNameExtractor
int origLevel = getLevel(transformerName, sourceMimetype);
TransformationOptionLimits limits = new TransformationOptionLimits();
// Start at the most general limits and then override with more specific values so that
// defaults from the most general get used if there is not something more specific.
for (int level=0; level<origLevel; level++)
{
TransformationOptionLimits defaultLimits =