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

Merged V4.1-BUG-FIX (4.1.5) to HEAD (4.2)

Browse Source 
47769: Merged V4.1.4 (4.1.4) to V4.1-BUG-FIX (4.1.5)
      47768: ALF-17444 transformation of Outlook files (.msg) doesn't work ootb
         - Downgrade ERROR to debug
         - Complex transformer correctly checks all transformations between intermediate mimetypes.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@47773 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2013-03-07 18:01:39 +00:00
parent 4cf6146ada
commit 6358e05cc9
4 changed files with 63 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
source/java/org/alfresco/repo/content/ContentServiceImpl.java
View File

@@ -41,6 +41,7 @@ import org.alfresco.repo.content.transform.ContentTransformer;
import org.alfresco.repo.content.transform.ContentTransformerRegistry;
import org.alfresco.repo.content.transform.TransformerDebug;
import org.alfresco.repo.content.transform.UnimportantTransformException;
import org.alfresco.repo.content.transform.UnsupportedTransformationException;
import org.alfresco.repo.node.NodeServicePolicies;
import org.alfresco.repo.policy.ClassPolicyDelegate;
import org.alfresco.repo.policy.JavaBehaviour;
@@ -722,19 +723,21 @@ public class ContentServiceImpl implements ContentService, ApplicationContextAwa
if (done)
{
message = "Transformer succeeded after previous transformer failed"+ (message == null ? "" : ": "+message);
if (rootCause instanceof UnimportantTransformException)
if (rootCause instanceof UnsupportedTransformationException ||
rootCause instanceof UnimportantTransformException)
{
logger.debug(message);
}
else
{
logger.error(message, e);
logger.warn(message, e);
}
}
else if (!first) // The first exception is logged later
{
message = "Transformer exception"+ (message == null ? "" : ": "+message);
if (rootCause instanceof UnimportantTransformException)
if (rootCause instanceof UnsupportedTransformationException ||
rootCause instanceof UnimportantTransformException)
{
logger.debug(message);
}