[sling-org-apache-sling-fsresource] branch master updated (77e5783 -> 6790568)

[js...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

jsedding pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-fsresource.git.


 discard 77e5783  SLING-7370 - File system resource provider may never recover from JSON/XML syntax errors
     new 6790568  SLING-7370 - File system resource provider may never recover from JSON/XML syntax errors

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (77e5783)
            \
             N -- N -- N   refs/heads/master (6790568)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:

-- 
To stop receiving notification emails like this one, please contact
['"commits@sling.apache.org" <co...@sling.apache.org>'].

[sling-org-apache-sling-fsresource] 01/01: SLING-7370 - File system resource provider may never recover from JSON/XML syntax errors

[js...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

jsedding pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-fsresource.git

commit 6790568400017d7ab6939bb60a5ada527e82fc28
Author: Julian Sedding <js...@apache.org>
AuthorDate: Wed Jan 10 08:57:14 2018 +0100

    SLING-7370 - File system resource provider may never recover from JSON/XML syntax errors
---
 src/main/java/org/apache/sling/fsprovider/internal/FileMonitor.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/apache/sling/fsprovider/internal/FileMonitor.java b/src/main/java/org/apache/sling/fsprovider/internal/FileMonitor.java
index a164d4f..08af507 100644
--- a/src/main/java/org/apache/sling/fsprovider/internal/FileMonitor.java
+++ b/src/main/java/org/apache/sling/fsprovider/internal/FileMonitor.java
@@ -166,9 +166,9 @@ public final class FileMonitor extends TimerTask {
             // check if the file has been removed
             if ( !monitorable.file.exists() ) {
                 // removed file and update status
-                sendEvents(monitorable, ChangeType.REMOVED, reporter);
-                monitorable.status = NonExistingStatus.SINGLETON;
                 contentFileCache.remove(transformPath(monitorable.path));
+                monitorable.status = NonExistingStatus.SINGLETON;
+                sendEvents(monitorable, ChangeType.REMOVED, reporter);
             } else {
                 // check for changes
                 final FileStatus fs = (FileStatus)monitorable.status;
@@ -176,9 +176,9 @@ public final class FileMonitor extends TimerTask {
                 if ( fs.lastModified < monitorable.file.lastModified() ) {
                     fs.lastModified = monitorable.file.lastModified();
                     // changed
+                    contentFileCache.remove(transformPath(monitorable.path));
                     sendEvents(monitorable, ChangeType.CHANGED, reporter);
                     changed = true;
-                    contentFileCache.remove(transformPath(monitorable.path));
                 }
                 if ( fs instanceof DirStatus ) {
                     // directory

-- 
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.