commit 39519d23fac61fcf1b9aeec8f5b2d012008fefc8
author Amit Gupta <amitgupt@apache.org> Thu Feb 06 05:34:01 2014 +0000
committer Amit Gupta <amitgupt@apache.org> Thu Feb 06 05:34:01 2014 +0000
tree cbf8b5b13dd9ed2c4daabeb26ba525f77d2bde9c
parent 07012f009b6a69681579ae282925d8ef24f50b45

SLING-3376 - TenantProvider passes tenant with old state to TenantCustomizer

Applied the patch. Thanks Roland for the patch.

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1565082 13f79535-47bb-0310-9956-ffa450edef68

src/main/java/org/apache/sling/tenant/internal/TenantProviderImpl.java

diff --git a/src/main/java/org/apache/sling/tenant/internal/TenantProviderImpl.java b/src/main/java/org/apache/sling/tenant/internal/TenantProviderImpl.java
index e52c884..5c48496 100644
--- a/src/main/java/org/apache/sling/tenant/internal/TenantProviderImpl.java
+++ b/src/main/java/org/apache/sling/tenant/internal/TenantProviderImpl.java
@@ -381,6 +381,12 @@
                     Resource tenantRes = getTenantResource(resolver, tenant.getId());

                     if (tenantRes != null) {

                         updater.update(tenantRes.adaptTo(ModifiableValueMap.class));

+

+                        //refresh so that customizer gets a refreshed tenant instance

+                        if (tenant instanceof TenantImpl) {

+                            ((TenantImpl) tenant).loadProperties(tenantRes);

+                        }

+

                         customizeTenant(tenantRes, tenant);

                         resolver.commit();