This is an automated email from the ASF dual-hosted git repository. rombert pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/sling-ide-tooling.git
commit dc1d5fbdef11c0030e51e24c06c1e686fca172e3 Author: Robert Munteanu <[email protected]> AuthorDate: Thu Apr 19 17:31:48 2018 +0300 SLING-7587 - Create a CLI-only tool to sync content More resilience against ignored and non-existing resources. --- .../ide/sync/content/impl/DefaultSyncCommandFactory.java | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/shared/modules/api/src/main/java/org/apache/sling/ide/sync/content/impl/DefaultSyncCommandFactory.java b/shared/modules/api/src/main/java/org/apache/sling/ide/sync/content/impl/DefaultSyncCommandFactory.java index f82504b..fb4374d 100644 --- a/shared/modules/api/src/main/java/org/apache/sling/ide/sync/content/impl/DefaultSyncCommandFactory.java +++ b/shared/modules/api/src/main/java/org/apache/sling/ide/sync/content/impl/DefaultSyncCommandFactory.java @@ -209,6 +209,15 @@ localFile); public ResourceAndInfo buildResourceAndInfo(WorkspaceResource resource, Repository repository) throws IOException { + if ( !resource.exists() ) { + return null; + } + + if ( resource.isIgnored()) { + logger.trace("Skipping team-private resource {0}", resource); + return null; + } + Long modificationTimestamp = (Long) resource.getTransientProperty(PN_IMPORT_MODIFICATION_TIMESTAMP); if (modificationTimestamp != null && modificationTimestamp >= resource.getLastModified()) { @@ -217,11 +226,6 @@ localFile); return null; } - if (resource.isIgnored()) { - logger.trace("Skipping team-private resource {0}", resource); - return null; - } - FileInfo info = createFileInfo(resource); logger.trace("For {0} built fileInfo {1}", resource, info); -- To stop receiving notification emails like this one, please contact [email protected].
