This is an automated email from the ASF dual-hosted git repository. rombert pushed a commit to annotated tag org.apache.sling.resourceresolver-1.0.0 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-resourceresolver.git
commit 50e0528e719ee05f521f95774179525f234e8577 Author: Carsten Ziegeler <cziege...@apache.org> AuthorDate: Wed Sep 26 09:51:49 2012 +0000 SLING-2530 : Implement CRUD based on resources git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/resourceresolver@1390359 13f79535-47bb-0310-9956-ffa450edef68 --- .../sling/resourceresolver/impl/ResourceResolverImpl.java | 8 ++++---- .../impl/helper/ResourceResolverContext.java | 13 +++++++------ 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/src/main/java/org/apache/sling/resourceresolver/impl/ResourceResolverImpl.java b/src/main/java/org/apache/sling/resourceresolver/impl/ResourceResolverImpl.java index 4bd0c9e..b6efff4 100644 --- a/src/main/java/org/apache/sling/resourceresolver/impl/ResourceResolverImpl.java +++ b/src/main/java/org/apache/sling/resourceresolver/impl/ResourceResolverImpl.java @@ -863,7 +863,7 @@ public class ResourceResolverImpl extends SlingAdaptable implements ResourceReso // we do not have a child with the exact name, so we look for // a child, whose alias matches the childName - + final Map<String, String> aliases = factory.getMapEntries().getAliasMap(parent.getPath()); if (aliases != null) { if (aliases.containsKey(childName)) { @@ -1043,20 +1043,20 @@ public class ResourceResolverImpl extends SlingAdaptable implements ResourceReso * @see org.apache.sling.api.resource.ResourceResolver#revert() */ public void revert() { - this.context.revert(); + this.context.revert(this); } /** * @see org.apache.sling.api.resource.ResourceResolver#commit() */ public void commit() throws PersistenceException { - this.context.commit(); + this.context.commit(this); } /** * @see org.apache.sling.api.resource.ResourceResolver#hasChanges() */ public boolean hasChanges() { - return this.context.hasChanges(); + return this.context.hasChanges(this); } } diff --git a/src/main/java/org/apache/sling/resourceresolver/impl/helper/ResourceResolverContext.java b/src/main/java/org/apache/sling/resourceresolver/impl/helper/ResourceResolverContext.java index 2901cb5..d3c3543 100644 --- a/src/main/java/org/apache/sling/resourceresolver/impl/helper/ResourceResolverContext.java +++ b/src/main/java/org/apache/sling/resourceresolver/impl/helper/ResourceResolverContext.java @@ -26,6 +26,7 @@ import org.apache.sling.api.resource.DynamicResourceProvider; import org.apache.sling.api.resource.ModifyingResourceProvider; import org.apache.sling.api.resource.PersistenceException; import org.apache.sling.api.resource.ResourceProvider; +import org.apache.sling.api.resource.ResourceResolver; /** * This class keeps track of the used resource providers for a @@ -125,27 +126,27 @@ public class ResourceResolverContext { /** * Revert all transient changes. */ - public void revert() { + public void revert(final ResourceResolver resolver) { for(final ModifyingResourceProvider provider : this.modifyingProviders) { - provider.revert(); + provider.revert(resolver); } } /** * Commit all transient changes */ - public void commit() throws PersistenceException { + public void commit(final ResourceResolver resolver) throws PersistenceException { for(final ModifyingResourceProvider provider : this.modifyingProviders) { - provider.commit(); + provider.commit(resolver); } } /** * Do we have changes? */ - public boolean hasChanges() { + public boolean hasChanges(final ResourceResolver resolver) { for(final ModifyingResourceProvider provider : this.modifyingProviders) { - if ( provider.hasChanges() ) { + if ( provider.hasChanges(resolver) ) { return true; } } -- To stop receiving notification emails like this one, please contact "commits@sling.apache.org" <commits@sling.apache.org>.