You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by fm...@apache.org on 2013/04/04 15:19:03 UTC
svn commit: r1464520 - in /syncope/trunk: ./
core/src/main/java/org/apache/syncope/core/sync/impl/SyncJob.java
Author: fmartelli
Date: Thu Apr 4 13:19:03 2013
New Revision: 1464520
URL: http://svn.apache.org/r1464520
Log:
merged from branch 1_1_X
Modified:
syncope/trunk/ (props changed)
syncope/trunk/core/src/main/java/org/apache/syncope/core/sync/impl/SyncJob.java
Propchange: syncope/trunk/
------------------------------------------------------------------------------
Merged /syncope/branches/1_1_X:r1464484-1464515
Modified: syncope/trunk/core/src/main/java/org/apache/syncope/core/sync/impl/SyncJob.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/sync/impl/SyncJob.java?rev=1464520&r1=1464519&r2=1464520&view=diff
==============================================================================
--- syncope/trunk/core/src/main/java/org/apache/syncope/core/sync/impl/SyncJob.java (original)
+++ syncope/trunk/core/src/main/java/org/apache/syncope/core/sync/impl/SyncJob.java Thu Apr 4 13:19:03 2013
@@ -106,7 +106,7 @@ public class SyncJob extends AbstractTas
* @param dryRun dry run?
* @return report as string
*/
- private String createReport(final List<SyncResult> syncResults, final TraceLevel syncTraceLevel,
+ protected String createReport(final List<SyncResult> syncResults, final TraceLevel syncTraceLevel,
final boolean dryRun) {
if (syncTraceLevel == TraceLevel.NONE) {
@@ -452,6 +452,6 @@ public class SyncJob extends AbstractTas
// True if either failed and failures have to be registered, or if ALL has to be registered.
return (Status.valueOf(execution.getStatus()) == Status.FAILURE
&& syncTask.getResource().getSyncTraceLevel().ordinal() >= TraceLevel.FAILURES.ordinal())
- || syncTask.getResource().getSyncTraceLevel() == TraceLevel.ALL;
+ || syncTask.getResource().getSyncTraceLevel().ordinal() >= TraceLevel.SUMMARY.ordinal();
}
}