You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by js...@apache.org on 2018/01/10 07:57:41 UTC
[sling-org-apache-sling-fsresource] 01/01: SLING-7370 - File system
resource provider may never recover from JSON/XML syntax errors
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>.