svn commit: r1562713 - /sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/helper/ResourceResolverContext.java

[fm...@apache.org]

Author: fmeschbe
Date: Thu Jan 30 08:06:50 2014
New Revision: 1562713

URL: http://svn.apache.org/r1562713
Log:
SLING-3350 Adapt to simplified Features service API

(no need for the ClientContext any longer)

Modified:
    sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/helper/ResourceResolverContext.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=1562713&r1=1562712&r2=1562713&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 Thu Jan 30 08:06:50 2014
@@ -33,7 +33,6 @@ import org.apache.sling.api.resource.Res
 import org.apache.sling.api.resource.ResourceResolverFactory;
 import org.apache.sling.api.resource.ResourceUtil;
 import org.apache.sling.api.resource.ValueMap;
-import org.apache.sling.featureflags.ClientContext;
 import org.apache.sling.featureflags.Features;
 import org.apache.sling.resourceresolver.impl.ResourceAccessSecurityTracker;
 
@@ -283,20 +282,20 @@ public class ResourceResolverContext {
         if (resource != null) {
             Object featuresService = this.featuresHolder.getFeatures();
             if (featuresService instanceof Features) {
-                String[] features = getProperty(resource, RESOURCE_PROPERTY, String[].class);
-                if (features != null && features.length > 0) {
-                    ClientContext featureContext = ((Features) featuresService).getCurrentClientContext();
-                    for (String feature : features) {
+                Features features = (Features) featuresService;
+                String[] featureNames = getProperty(resource, RESOURCE_PROPERTY, String[].class);
+                if (featureNames != null && featureNames.length > 0) {
+                    for (String featureName : featureNames) {
 
                         // check whether the feature must be disabled
                         boolean negative = false;
-                        if (feature.charAt(0) == '-') {
-                            feature = feature.substring(1);
+                        if (featureName.charAt(0) == '-') {
+                            featureName = featureName.substring(1);
                             negative = true;
                         }
 
-                        if (featureContext.isEnabled(feature) ^ negative) {
-                            resource.getResourceMetadata().put(RESOURCE_PROPERTY, features);
+                        if (features.isEnabled(featureName) ^ negative) {
+                            resource.getResourceMetadata().put(RESOURCE_PROPERTY, featureNames);
                             return resource;
                         }
                     }