You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by bd...@apache.org on 2015/02/03 16:55:05 UTC
svn commit: r1656768 - in
/sling/whiteboard/bdelacretaz/multisling2015/tenant-resolver/src/main/java/org/apache/sling/ms2015/tenantresolver/impl:
ContentBasedTenant.java ContentTenantAdapterFactory.java
Author: bdelacretaz
Date: Tue Feb 3 15:55:05 2015
New Revision: 1656768
URL: http://svn.apache.org/r1656768
Log:
SLING-4386 - tweaks
Modified:
sling/whiteboard/bdelacretaz/multisling2015/tenant-resolver/src/main/java/org/apache/sling/ms2015/tenantresolver/impl/ContentBasedTenant.java
sling/whiteboard/bdelacretaz/multisling2015/tenant-resolver/src/main/java/org/apache/sling/ms2015/tenantresolver/impl/ContentTenantAdapterFactory.java
Modified: sling/whiteboard/bdelacretaz/multisling2015/tenant-resolver/src/main/java/org/apache/sling/ms2015/tenantresolver/impl/ContentBasedTenant.java
URL: http://svn.apache.org/viewvc/sling/whiteboard/bdelacretaz/multisling2015/tenant-resolver/src/main/java/org/apache/sling/ms2015/tenantresolver/impl/ContentBasedTenant.java?rev=1656768&r1=1656767&r2=1656768&view=diff
==============================================================================
--- sling/whiteboard/bdelacretaz/multisling2015/tenant-resolver/src/main/java/org/apache/sling/ms2015/tenantresolver/impl/ContentBasedTenant.java (original)
+++ sling/whiteboard/bdelacretaz/multisling2015/tenant-resolver/src/main/java/org/apache/sling/ms2015/tenantresolver/impl/ContentBasedTenant.java Tue Feb 3 15:55:05 2015
@@ -18,7 +18,6 @@
*/
package org.apache.sling.ms2015.tenantresolver.impl;
-import java.util.Arrays;
import java.util.HashMap;
import java.util.Iterator;
Modified: sling/whiteboard/bdelacretaz/multisling2015/tenant-resolver/src/main/java/org/apache/sling/ms2015/tenantresolver/impl/ContentTenantAdapterFactory.java
URL: http://svn.apache.org/viewvc/sling/whiteboard/bdelacretaz/multisling2015/tenant-resolver/src/main/java/org/apache/sling/ms2015/tenantresolver/impl/ContentTenantAdapterFactory.java?rev=1656768&r1=1656767&r2=1656768&view=diff
==============================================================================
--- sling/whiteboard/bdelacretaz/multisling2015/tenant-resolver/src/main/java/org/apache/sling/ms2015/tenantresolver/impl/ContentTenantAdapterFactory.java (original)
+++ sling/whiteboard/bdelacretaz/multisling2015/tenant-resolver/src/main/java/org/apache/sling/ms2015/tenantresolver/impl/ContentTenantAdapterFactory.java Tue Feb 3 15:55:05 2015
@@ -78,6 +78,9 @@ public class ContentTenantAdapterFactory
private Tenant getTenant(Resource r) {
final String path = r.getPath();
Tenant result = null;
+ // TODO testing for the contentRootPath might not
+ // be needed anymore, as we just go up the tree to find a
+ // sling:tenantId
if(!path.startsWith(contentRootPath)) {
log.debug("Path {} does not start with {}, Resource ignored", path, contentRootPath);
}