You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by fm...@apache.org on 2014/01/29 12:32:46 UTC
svn commit: r1562416 - in /sling/trunk:
bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/helper/ResourceResolverContext.java
contrib/extensions/feature-flags/src/main/java/org/apache/sling/featureflags/impl/FeatureManager.java
Author: fmeschbe
Date: Wed Jan 29 11:32:46 2014
New Revision: 1562416
URL: http://svn.apache.org/r1562416
Log:
SLING-3346 Feature flag not respected
- Turns out we need both filter registration because initial
resource resolution takes place before any Sling filter is
called
- An issue was unconvered where negative feature checks
had no effect
Modified:
sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/helper/ResourceResolverContext.java
sling/trunk/contrib/extensions/feature-flags/src/main/java/org/apache/sling/featureflags/impl/FeatureManager.java
Modified: sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/helper/ResourceResolverContext.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/helper/ResourceResolverContext.java?rev=1562416&r1=1562415&r2=1562416&view=diff
==============================================================================
--- sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/helper/ResourceResolverContext.java (original)
+++ sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/helper/ResourceResolverContext.java Wed Jan 29 11:32:46 2014
@@ -292,7 +292,7 @@ public class ResourceResolverContext {
boolean negative = false;
if (feature.charAt(0) == '-') {
feature = feature.substring(1);
- negative = false;
+ negative = true;
}
if (featureContext.isEnabled(feature) ^ negative) {
Modified: sling/trunk/contrib/extensions/feature-flags/src/main/java/org/apache/sling/featureflags/impl/FeatureManager.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/feature-flags/src/main/java/org/apache/sling/featureflags/impl/FeatureManager.java?rev=1562416&r1=1562415&r2=1562416&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/feature-flags/src/main/java/org/apache/sling/featureflags/impl/FeatureManager.java (original)
+++ sling/trunk/contrib/extensions/feature-flags/src/main/java/org/apache/sling/featureflags/impl/FeatureManager.java Wed Jan 29 11:32:46 2014
@@ -101,10 +101,17 @@ public class FeatureManager {
services.add(bundleContext.registerService(Filter.class.getName(), new CurrentClientContextFilter(this),
new Hashtable<String, Object>() {
{
- put("sling.filter.scope", "REQUEST");
+ put("pattern", "/.*");
put("service.ranking", Integer.MIN_VALUE);
}
}));
+ services.add(bundleContext.registerService(Filter.class.getName(), new CurrentClientContextFilter(this),
+ new Hashtable<String, Object>() {
+ {
+ put("sling.filter.scope", "REQUEST");
+ put("service.ranking", Integer.MIN_VALUE);
+ }
+ }));
this.services = services;
}