mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-08-07 17:49:17 +00:00
Format fixing during investigation of ALF-20086
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@55727 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
@@ -520,12 +520,12 @@ public abstract class AbstractPatch implements Patch, ApplicationEventPublisher
|
|||||||
// Now do the work
|
// Now do the work
|
||||||
int numberOfInvocations = batchProcessor.process(worker, true);
|
int numberOfInvocations = batchProcessor.process(worker, true);
|
||||||
|
|
||||||
if(logger.isDebugEnabled())
|
if (logger.isDebugEnabled())
|
||||||
{
|
{
|
||||||
logger.debug("batch worker finished processing id:" + id);
|
logger.debug("batch worker finished processing id:" + id);
|
||||||
}
|
}
|
||||||
|
|
||||||
if(batchProcessor.getTotalErrors() > 0)
|
if (batchProcessor.getTotalErrors() > 0)
|
||||||
{
|
{
|
||||||
report = report + "\n" + " and failure during update of tennants total success: " + batchProcessor.getSuccessfullyProcessedEntries() + " number of errors: " +batchProcessor.getTotalErrors() + " lastError" + batchProcessor.getLastError();
|
report = report + "\n" + " and failure during update of tennants total success: " + batchProcessor.getSuccessfullyProcessedEntries() + " number of errors: " +batchProcessor.getTotalErrors() + " lastError" + batchProcessor.getLastError();
|
||||||
}
|
}
|
||||||
@@ -563,8 +563,7 @@ public abstract class AbstractPatch implements Patch, ApplicationEventPublisher
|
|||||||
|
|
||||||
private String apply(boolean async)
|
private String apply(boolean async)
|
||||||
{
|
{
|
||||||
|
if (!async)
|
||||||
if(!async)
|
|
||||||
{
|
{
|
||||||
// Do we bug out of patch execution
|
// Do we bug out of patch execution
|
||||||
if (deferred)
|
if (deferred)
|
||||||
@@ -735,14 +734,16 @@ public abstract class AbstractPatch implements Patch, ApplicationEventPublisher
|
|||||||
* Should the patch be deferred? And not run at bootstrap.
|
* Should the patch be deferred? And not run at bootstrap.
|
||||||
* @param deferred
|
* @param deferred
|
||||||
*/
|
*/
|
||||||
public void setDeferred(boolean deferred) {
|
public void setDeferred(boolean deferred)
|
||||||
|
{
|
||||||
this.deferred = deferred;
|
this.deferred = deferred;
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
public boolean isDeferred() {
|
public boolean isDeferred()
|
||||||
|
{
|
||||||
return deferred;
|
return deferred;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -48,7 +48,6 @@ import org.springframework.extensions.surf.util.I18NUtil;
|
|||||||
* The first use-case is when there is a child called cm:shared and we want to patch a folder with app:shared
|
* The first use-case is when there is a child called cm:shared and we want to patch a folder with app:shared
|
||||||
*
|
*
|
||||||
* @author mrogers
|
* @author mrogers
|
||||||
*
|
|
||||||
*/
|
*/
|
||||||
public class SharedFolderPatch extends GenericBootstrapPatch
|
public class SharedFolderPatch extends GenericBootstrapPatch
|
||||||
{
|
{
|
||||||
@@ -180,23 +179,27 @@ public class SharedFolderPatch extends GenericBootstrapPatch
|
|||||||
return super.applyInternal();
|
return super.applyInternal();
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setRenamePath(String renamePath) {
|
public void setRenamePath(String renamePath)
|
||||||
|
{
|
||||||
this.renamePath = renamePath;
|
this.renamePath = renamePath;
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getRenamePath() {
|
public String getRenamePath()
|
||||||
|
{
|
||||||
return renamePath;
|
return renamePath;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setJobLockService(JobLockService jobLockService) {
|
public void setJobLockService(JobLockService jobLockService)
|
||||||
|
{
|
||||||
this.jobLockService = jobLockService;
|
this.jobLockService = jobLockService;
|
||||||
}
|
}
|
||||||
|
|
||||||
public JobLockService getJobLockService() {
|
public JobLockService getJobLockService()
|
||||||
|
{
|
||||||
return jobLockService;
|
return jobLockService;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Job to initiate the {@link SharedFolderPatch} if it has been deferred
|
* Job to initiate the {@link SharedFolderPatch} if it has been deferred
|
||||||
*
|
*
|
||||||
* @author Mark Rogers
|
* @author Mark Rogers
|
||||||
|
Reference in New Issue
Block a user