You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by bd...@apache.org on 2016/11/13 15:05:49 UTC
svn commit: r1769503 -
/sling/trunk/installer/providers/jcr/src/main/java/org/apache/sling/installer/provider/jcr/impl/JcrInstaller.java
Author: bdelacretaz
Date: Sun Nov 13 15:05:49 2016
New Revision: 1769503
URL: http://svn.apache.org/viewvc?rev=1769503&view=rev
Log:
SLING-6274 - avoid busy loop when scanning is paused
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=1769503&r1=1769502&r2=1769503&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 Sun Nov 13 15:05:49 2016
@@ -504,6 +504,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;
@@ -582,7 +589,7 @@ public class JcrInstaller implements Upd
while (childItr.hasNext()) {
nodeNames.add(childItr.nextNode().getName());
}
- logger.debug("Found child nodes {} at path {}. Scanning would be paused", nodeNames, cfg.getPauseScanNodePath());
+ logger.debug("Found child nodes {} at path {}. Scanning will be paused", nodeNames, cfg.getPauseScanNodePath());
}
return result;
}