mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-08-07 17:49:17 +00:00
Merged V3.1 to HEAD
13218: Partial fix for ETHREEOH-1259 - the null pointer exceptions are gone to be replaced by sensible error messages. 13220: Merged V3.0 to V3.1 13219: Build Fix for error in hand merge of r13141 from V2.2 to V3.0 13226: Clearer debugging of exceptions during NodeService cleanup 13228: ETHREEOH-1250 13229: Fix for ETHREEOH-1184: Share webscript configuration does not support international chars as values 13235: Add support to exclude admin and guest from person permission fix ups. Tidy up for ETHREEOH-1239 13239: Build Fix 13243: ETHREEOH-1308: Update AMPs to indicate unsupported status 13247: Build fix - do not delete admin :-) 13248: Fix build 13254: Fix for ETHREEOH-1351: Schemas containing an enumeration with an empty string ... ___________________________________________________________________ Modified: svn:mergeinfo Merged /alfresco/BRANCHES/V3.0:r13219 Merged /alfresco/BRANCHES/V3.1:r13218-13220,13224,13226-13229,13231-13232,13234-13237,13239,13241,13243-13248,13250,13252-13254 git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13612 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
@@ -92,7 +92,7 @@ public abstract class AbstractNodeCleanupWorker implements NodeCleanupWorker
|
||||
StackTraceUtil.buildStackTrace(
|
||||
"Node cleanup failed: " +
|
||||
" Worker: " + this.getClass().getName() + "\n" +
|
||||
" Error: ",
|
||||
" Error: " + e.getMessage(),
|
||||
e.getStackTrace(),
|
||||
sb,
|
||||
Integer.MAX_VALUE);
|
||||
@@ -102,7 +102,7 @@ public abstract class AbstractNodeCleanupWorker implements NodeCleanupWorker
|
||||
StackTraceUtil.buildStackTrace(
|
||||
"Node cleanup failed: " +
|
||||
" Worker: " + this.getClass().getName() + "\n" +
|
||||
" Error: ",
|
||||
" Error: " + e.getMessage(),
|
||||
e.getStackTrace(),
|
||||
sb,
|
||||
20);
|
||||
|
@@ -53,10 +53,10 @@ public class NodeCleanupRegistry implements NodeCleanupWorker
|
||||
StackTraceUtil.buildStackTrace(
|
||||
"Node cleanup failed: " +
|
||||
" Worker: " + cleanupWorker.getClass().getName() + "\n" +
|
||||
" Error: ",
|
||||
" Error: " + e.getMessage(),
|
||||
e.getStackTrace(),
|
||||
sb,
|
||||
20);
|
||||
0);
|
||||
results.add(sb.toString());
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user