Author: markt
Date: Tue Jan 27 19:35:17 2015
New Revision: 1655122
URL: http://svn.apache.org/r1655122
Log:
Add background processing to WebResourceSets (currently a NO-OP)
Modified:
tomcat/trunk/java/org/apache/catalina/WebResourceSet.java
tomcat/trunk/java/org/apache/catalina/webresources/AbstractResourceSet.java
tomcat/trunk/java/org/apache/catalina/webresources/EmptyResourceSet.java
tomcat/trunk/java/org/apache/catalina/webresources/StandardRoot.java
Modified: tomcat/trunk/java/org/apache/catalina/WebResourceSet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/WebResourceSet.java?rev=1655122&r1=1655121&r2=1655122&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/WebResourceSet.java (original)
+++ tomcat/trunk/java/org/apache/catalina/WebResourceSet.java Tue Jan 27
19:35:17 2015
@@ -147,4 +147,10 @@ public interface WebResourceSet extends
* read-only, otherwise <code>false</code>
*/
boolean isReadOnly();
+
+ /**
+ * Hook to allow the WebResourceRoot to trigger regular tasks on this set
of
+ * resources.
+ */
+ void backgroundProcess();
}
Modified:
tomcat/trunk/java/org/apache/catalina/webresources/AbstractResourceSet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/webresources/AbstractResourceSet.java?rev=1655122&r1=1655121&r2=1655122&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/webresources/AbstractResourceSet.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/webresources/AbstractResourceSet.java
Tue Jan 27 19:35:17 2015
@@ -111,6 +111,12 @@ public abstract class AbstractResourceSe
this.staticOnly = staticOnly;
}
+ @Override
+ public void backgroundProcess() {
+ // NO-OP
+ }
+
+
//-------------------------------------------------------- Lifecycle
methods
@Override
protected final void startInternal() throws LifecycleException {
Modified:
tomcat/trunk/java/org/apache/catalina/webresources/EmptyResourceSet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/webresources/EmptyResourceSet.java?rev=1655122&r1=1655121&r2=1655122&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/webresources/EmptyResourceSet.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/webresources/EmptyResourceSet.java
Tue Jan 27 19:35:17 2015
@@ -152,6 +152,13 @@ public class EmptyResourceSet extends Li
return true;
}
+
+ @Override
+ public void backgroundProcess() {
+ // NO-OP
+ }
+
+
@Override
protected void initInternal() throws LifecycleException {
// NO-OP
Modified: tomcat/trunk/java/org/apache/catalina/webresources/StandardRoot.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/webresources/StandardRoot.java?rev=1655122&r1=1655121&r2=1655122&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/webresources/StandardRoot.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/webresources/StandardRoot.java Tue
Jan 27 19:35:17 2015
@@ -591,9 +591,15 @@ public class StandardRoot extends Lifecy
mainResources.add(main);
}
+
@Override
public void backgroundProcess() {
cache.backgroundProcess();
+ for (List<WebResourceSet> list : allResources) {
+ for (WebResourceSet webResourceSet : list) {
+ webResourceSet.backgroundProcess();
+ }
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
