svn commit: r1727920 - in /sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/legacy: LegacyResourceProviderAdapter.java LegacyResourceProviderFactoryAdapter.java

[cziegeler]

Author: cziegeler
Date: Mon Feb  1 11:20:28 2016
New Revision: 1727920

URL: http://svn.apache.org/viewvc?rev=1727920&view=rev
Log:
SLING-5470 : Resource providers might not be closed

Modified:
    
sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/legacy/LegacyResourceProviderAdapter.java
    
sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/legacy/LegacyResourceProviderFactoryAdapter.java

Modified: 
sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/legacy/LegacyResourceProviderAdapter.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/legacy/LegacyResourceProviderAdapter.java?rev=1727920&r1=1727919&r2=1727920&view=diff
==============================================================================
--- 
sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/legacy/LegacyResourceProviderAdapter.java
 (original)
+++ 
sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/legacy/LegacyResourceProviderAdapter.java
 Mon Feb  1 11:20:28 2016
@@ -145,7 +145,7 @@ public class LegacyResourceProviderAdapt
     }
 
     @Override
-    public void logout(final @Nonnull ResolverContext<Object> ctx) {
+    public void logout(final @Nonnull Object state) {
         if (rp instanceof DynamicResourceProvider) {
             ((DynamicResourceProvider) rp).close();
         }
@@ -229,7 +229,7 @@ public class LegacyResourceProviderAdapt
             return rp.queryResources(ctx.getResourceResolver(), query, 
language);
         }
     }
-    
+
     @Override
     public String toString() {
         return "[" + getClass().getSimpleName() + ": " + rp.toString() + " ]";

Modified: 
sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/legacy/LegacyResourceProviderFactoryAdapter.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/legacy/LegacyResourceProviderFactoryAdapter.java?rev=1727920&r1=1727919&r2=1727920&view=diff
==============================================================================
--- 
sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/legacy/LegacyResourceProviderFactoryAdapter.java
 (original)
+++ 
sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/legacy/LegacyResourceProviderFactoryAdapter.java
 Mon Feb  1 11:20:28 2016
@@ -59,8 +59,8 @@ public class LegacyResourceProviderFacto
     }
 
     @Override
-    public void logout(final @Nonnull 
ResolverContext<LegacyResourceProviderAdapter> ctx) {
-        ctx.getProviderState().logout(null);
+    public void logout(final @Nonnull LegacyResourceProviderAdapter state) {
+        state.logout(null);
     }
 
     @Override