Author: bdelacretaz
Date: Wed Dec 17 15:39:07 2014
New Revision: 1646281
URL: http://svn.apache.org/r1646281
Log:
SLING-4256 - fix cache invalidation - contributed by Radu Cotescu, thanks!
Modified:
sling/trunk/contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/engine/UnitChangeMonitor.java
Modified:
sling/trunk/contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/engine/UnitChangeMonitor.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/engine/UnitChangeMonitor.java?rev=1646281&r1=1646280&r2=1646281&view=diff
==============================================================================
---
sling/trunk/contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/engine/UnitChangeMonitor.java
(original)
+++
sling/trunk/contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/engine/UnitChangeMonitor.java
Wed Dec 17 15:39:07 2014
@@ -137,25 +137,21 @@ public class UnitChangeMonitor {
if (path.startsWith(UnitLoader.DEFAULT_REPO_BASE_PATH)) {
slySourcesMap.put(path, System.currentTimeMillis());
} else {
- for (String searchPath :searchPaths) {
- if (path.startsWith(searchPath)) {
- slyJavaUseMap.put(path, System.currentTimeMillis());
- return;
- }
+ if (path.endsWith(".java")) {
+ slyJavaUseMap.put(path, System.currentTimeMillis());
+ } else if
(path.endsWith(SightlyScriptEngineFactory.EXTENSION)) {
+ slyScriptsMap.put(path, System.currentTimeMillis());
}
- slyScriptsMap.put(path, System.currentTimeMillis());
}
} else if (SlingConstants.TOPIC_RESOURCE_REMOVED.equals(topic)) {
if (path.startsWith(UnitLoader.DEFAULT_REPO_BASE_PATH)) {
slySourcesMap.remove(path);
} else {
- for (String searchPath : searchPaths) {
- if (path.startsWith(searchPath)) {
- slyJavaUseMap.remove(path);
- return;
- }
+ if (path.endsWith(".java")) {
+ slyJavaUseMap.remove(path);
+ } else if
(path.endsWith(SightlyScriptEngineFactory.EXTENSION)) {
+ slyScriptsMap.remove(path);
}
- slyScriptsMap.remove(path);
}
}
}
