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 to HEAD

Browse Source 
43905: Fixed ALF-16166 "Breadcrumb not refreshing after Move action is used."
   43909: Merged V3.4-BUF-GIX (3.4.12) to V4.1-BUG-FIX (4.1.3)
      43908: Minor changes to TransformerDebug to make output more readable when there are exceptions.
   43912: Fix for ALF-16578. Now guesses the mimetype correctly - (actually uses the existing type).
   43915: Merged BRANCHES/DEV/BELARUS/V4.1-BUG-FIX-2012_11_12 to BRANCHES/DEV/V4.1-BUG-FIX:
      43853: ALF-15984: "Concurrent Editing" problem with Edit Online functionality with Office 2010
   43916: Fixed ALF-16906: MySQL: Add support for persisting special numeric property values
    - Double and Float special values ("NaN", "-Infinity" and "Infinity") are persisted
      in alf_node_properties in their string form.
    - Checks included to ensure that conversions to and from Double and Float are covered correctly
   43926: ALF-16909: Discussion topics are sorted in ascending order (oldest first and newest last) when selecting 'All topics'
   - Fixed unit test to expect newest first, as re-introduced into 3.4.12
   43927: ALF-12711: Fixed 'test mode' behaviour of MailActionExecuter
   43928: Merged V4.1 to V4.1-BUG-FIX
      43906: ALF-15993: Installation folder is not empty after uninstall
      - Added webquickstart log removal
      43917: ALF-16886: SubscriptionServiceActivitiesTest and SiteServiceTest failing on Oracle
      - Fix by Dmitry
      43920: ALF-16753: RU: Incorrect date format in Alfresco Explorer 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@43929 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Dave Ward
2012-11-24 12:05:57 +00:00
parent 182c29aac2
commit d0739b811d
8 changed files with 81 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/java/org/alfresco/repo/content/transform/AbstractContentTransformer2.java
View File

@@ -268,7 +268,7 @@ public abstract class AbstractContentTransformer2 extends AbstractContentTransfo
// Report the error
if(differentType == null)
{
transformerDebug.debug("Failed", e);
transformerDebug.debug(" Failed", e);
throw new ContentIOException("Content conversion failed: \n" +
" reader: " + reader + "\n" +
" writer: " + writer + "\n" +
@@ -278,7 +278,7 @@ public abstract class AbstractContentTransformer2 extends AbstractContentTransfo
}
else
{
transformerDebug.debug("Failed: Mime type was '"+differentType+"'", e);
transformerDebug.debug(" Failed: Mime type was '"+differentType+"'", e);
throw new ContentIOException("Content conversion failed: \n" +
" reader: " + reader + "\n" +
" writer: " + writer + "\n" +

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

@@ -241,7 +241,7 @@ public class FailoverContentTransformer extends AbstractContentTransformer2 impl
// At this point we have tried all transformers in the sequence without apparent success.
if (transformationException != null)
{
transformerDebug.debug("No more transformations to failover to");
transformerDebug.debug(" No more transformations to failover to");
if (logger.isDebugEnabled())
{
logger.debug("All transformations were unsuccessful. Throwing latest exception.", transformationException);

10
source/java/org/alfresco/repo/content/transform/TransformerDebug.java
View File

@@ -641,7 +641,15 @@ public class TransformerDebug
{
if (isEnabled())
{
log(message + ' ' + t.getMessage());
// Trim messages of the form: "Failed... : \n reader:...\n writer:..."
String msg = t.getMessage();
int i = msg.indexOf(": \n");
if (i != -1)
{
msg = msg.substring(0, i);
}
log(message + ' ' + msg);
Deque<Frame> ourStack = ThreadInfo.getStack();
if (!ourStack.isEmpty())