You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ol...@apache.org on 2016/11/28 18:12:46 UTC
svn commit: r1771785 -
/sling/trunk/installer/providers/jcr/src/main/java/org/apache/sling/installer/provider/jcr/impl/JcrInstaller.java
Author: olli
Date: Mon Nov 28 18:12:46 2016
New Revision: 1771785
URL: http://svn.apache.org/viewvc?rev=1771785&view=rev
Log:
SLING-6337 Fix default folder name regular expression
Modified:
sling/trunk/installer/providers/jcr/src/main/java/org/apache/sling/installer/provider/jcr/impl/JcrInstaller.java
Modified: sling/trunk/installer/providers/jcr/src/main/java/org/apache/sling/installer/provider/jcr/impl/JcrInstaller.java
URL: http://svn.apache.org/viewvc/sling/trunk/installer/providers/jcr/src/main/java/org/apache/sling/installer/provider/jcr/impl/JcrInstaller.java?rev=1771785&r1=1771784&r2=1771785&view=diff
==============================================================================
--- sling/trunk/installer/providers/jcr/src/main/java/org/apache/sling/installer/provider/jcr/impl/JcrInstaller.java (original)
+++ sling/trunk/installer/providers/jcr/src/main/java/org/apache/sling/installer/provider/jcr/impl/JcrInstaller.java Mon Nov 28 18:12:46 2016
@@ -104,7 +104,7 @@ public class JcrInstaller implements Upd
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 @@ public class JcrInstaller implements Upd
"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 @@ public class JcrInstaller implements Upd
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 @@ public class JcrInstaller implements Upd
}
}
-}
\ No newline at end of file
+}