sling-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
Subject svn commit: r1650508 - /sling/trunk/contrib/jcr/resourcesecurity/src/main/java/org/apache/sling/jcr/resourcesecurity/impl/ResourceAccessGateFactory.java
Date Fri, 09 Jan 2015 11:56:46 GMT
Author: cziegeler
Date: Fri Jan  9 11:56:46 2015
New Revision: 1650508

URL: http://svn.apache.org/r1650508
Log:
SLING-4291 : NPE if optional prefix is not configured

Modified:
    sling/trunk/contrib/jcr/resourcesecurity/src/main/java/org/apache/sling/jcr/resourcesecurity/impl/ResourceAccessGateFactory.java

Modified: sling/trunk/contrib/jcr/resourcesecurity/src/main/java/org/apache/sling/jcr/resourcesecurity/impl/ResourceAccessGateFactory.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/jcr/resourcesecurity/src/main/java/org/apache/sling/jcr/resourcesecurity/impl/ResourceAccessGateFactory.java?rev=1650508&r1=1650507&r2=1650508&view=diff
==============================================================================
--- sling/trunk/contrib/jcr/resourcesecurity/src/main/java/org/apache/sling/jcr/resourcesecurity/impl/ResourceAccessGateFactory.java
(original)
+++ sling/trunk/contrib/jcr/resourcesecurity/src/main/java/org/apache/sling/jcr/resourcesecurity/impl/ResourceAccessGateFactory.java
Fri Jan  9 11:56:46 2015
@@ -73,8 +73,11 @@ public class ResourceAccessGateFactory
     protected void activate(final Map<String, Object> props) {
         this.jcrPath = PropertiesUtil.toString(props.get(PROP_JCR_PATH), null);
         this.prefix = PropertiesUtil.toString(props.get(PROP_PREFIX), null);
-        if ( !this.prefix.endsWith("/") ) {
-            this.prefix = this.prefix + "/";
+        if ( this.prefix != null ) {
+            if ( !this.prefix.endsWith("/") ) {
+                this.prefix = this.prefix + "/";
+            }
+            this.jcrPath = this.jcrPath + "/";
         }
     }
 
@@ -89,7 +92,7 @@ public class ResourceAccessGateFactory
         if ( session != null ) {
             String checkPath = this.jcrPath;
             if ( this.prefix != null && path.startsWith(this.prefix) ) {
-                checkPath = this.jcrPath + path.substring(this.prefix.length() - 1);
+                checkPath = this.jcrPath + path.substring(this.prefix.length());
             }
             try {
                 granted = session.hasPermission(checkPath, permission);



Mime
View raw message