Author: cziegeler
Date: Mon Dec 16 21:52:10 2013
New Revision: 1551368
URL: http://svn.apache.org/r1551368
Log:
SLING-2698 - resource access security service for resource providers without
backing ACLs - return null instead of a NonExistingResource
Modified:
sling/trunk/bundles/resourceaccesssecurity/src/main/java/org/apache/sling/resourceaccesssecurity/impl/ResourceAccessSecurityImpl.java
Modified:
sling/trunk/bundles/resourceaccesssecurity/src/main/java/org/apache/sling/resourceaccesssecurity/impl/ResourceAccessSecurityImpl.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/resourceaccesssecurity/src/main/java/org/apache/sling/resourceaccesssecurity/impl/ResourceAccessSecurityImpl.java?rev=1551368&r1=1551367&r2=1551368&view=diff
==============================================================================
---
sling/trunk/bundles/resourceaccesssecurity/src/main/java/org/apache/sling/resourceaccesssecurity/impl/ResourceAccessSecurityImpl.java
(original)
+++
sling/trunk/bundles/resourceaccesssecurity/src/main/java/org/apache/sling/resourceaccesssecurity/impl/ResourceAccessSecurityImpl.java
Mon Dec 16 21:52:10 2013
@@ -28,7 +28,6 @@ import org.apache.felix.scr.annotations.
import org.apache.felix.scr.annotations.Deactivate;
import org.apache.felix.scr.annotations.Property;
import org.apache.felix.scr.annotations.Service;
-import org.apache.sling.api.resource.NonExistingResource;
import org.apache.sling.api.resource.Resource;
import org.apache.sling.api.resource.ResourceResolver;
import org.apache.sling.api.security.AccessSecurityException;
@@ -127,8 +126,6 @@ public class ResourceAccessSecurityImpl
final Iterator<ResourceAccessGateHandler> accessGateHandlers =
getMatchingResourceAccessGateHandlerIterator(
resource.getPath(), ResourceAccessGate.Operation.READ);
if ( accessGateHandlers != null ) {
- final ResourceResolver resResolver =
resource.getResourceResolver();
-
GateResult finalGateResult = null;
boolean canReadAllValues = false;
List<ResourceAccessGate> accessGatesForValues = null;
@@ -161,7 +158,7 @@ public class ResourceAccessSecurityImpl
// return NonExistingResource if access is denied or no
// ResourceAccessGate is present
if (finalGateResult == null || finalGateResult ==
GateResult.DENIED) {
- returnValue = new
NonExistingResource(resResolver,resource.getPath());
+ returnValue = null;
} else if (finalGateResult == GateResult.DONTCARE) {
returnValue = resource;
}