SLING-6337 Fix default folder name regular expression
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1771785 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/src/main/java/org/apache/sling/installer/provider/jcr/impl/JcrInstaller.java b/src/main/java/org/apache/sling/installer/provider/jcr/impl/JcrInstaller.java
index dd4d553..8a72139 100644
--- a/src/main/java/org/apache/sling/installer/provider/jcr/impl/JcrInstaller.java
+++ b/src/main/java/org/apache/sling/installer/provider/jcr/impl/JcrInstaller.java
@@ -104,7 +104,7 @@
private static final String ENCODING = "UTF-8";
/** Default regexp for watched folders */
- public static final String DEFAULT_FOLDER_NAME_REGEXP = ".*/install|config$";
+ public static final String DEFAULT_FOLDER_NAME_REGEXP = ".*/(install|config)$";
/**
* ComponentContext property that overrides the folder name regexp
@@ -505,13 +505,13 @@
"JCR Provider scanning would not be performed", cfg.getPauseScanNodePath());
pauseMessageLogged = true;
}
-
+
try {
Thread.sleep(JcrInstaller.RUN_LOOP_DELAY_MSEC);
} catch(InterruptedException ignored) {
logger.debug("InterruptedException in scanningIsPaused block");
}
-
+
return;
} else if (pauseMessageLogged) {
pauseMessageLogged = false;
@@ -530,7 +530,7 @@
didRefresh = true;
}
counters.incrementAndGet(SCAN_FOLDERS_COUNTER);
-
+
final WatchedFolder.ScanResult sr = wf.scan();
boolean toDo = false;
if ( sr.toAdd.size() > 0 ) {
@@ -807,4 +807,4 @@
}
}
-}
\ No newline at end of file
+}