Author: cziegeler Date: Wed Oct 12 12:30:45 2016 New Revision: 1764446 URL: http://svn.apache.org/viewvc?rev=1764446&view=rev Log: SLING-5230 : Remove getAdministrativeResourceResolver() usage from org.apache.sling.event.dea
Modified: sling/trunk/bundles/extensions/dea/src/main/java/org/apache/sling/event/dea/impl/DistributedEventReceiver.java sling/trunk/bundles/extensions/dea/src/main/java/org/apache/sling/event/dea/impl/DistributedEventSender.java Modified: sling/trunk/bundles/extensions/dea/src/main/java/org/apache/sling/event/dea/impl/DistributedEventReceiver.java URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/dea/src/main/java/org/apache/sling/event/dea/impl/DistributedEventReceiver.java?rev=1764446&r1=1764445&r2=1764446&view=diff ============================================================================== --- sling/trunk/bundles/extensions/dea/src/main/java/org/apache/sling/event/dea/impl/DistributedEventReceiver.java (original) +++ sling/trunk/bundles/extensions/dea/src/main/java/org/apache/sling/event/dea/impl/DistributedEventReceiver.java Wed Oct 12 12:30:45 2016 @@ -136,7 +136,7 @@ public class DistributedEventReceiver DistributedEventReceiver.this.serviceRegistration = reg; try { - writerResolver = resourceResolverFactory.getAdministrativeResourceResolver(null); + writerResolver = resourceResolverFactory.getServiceResourceResolver(null); ResourceUtil.getOrCreateResource(writerResolver, ownRootPath, DistributedEventAdminImpl.RESOURCE_TYPE_FOLDER, @@ -296,7 +296,7 @@ public class DistributedEventReceiver this.logger.debug("Checking for old instance trees for distributed events."); ResourceResolver resolver = null; try { - resolver = this.resourceResolverFactory.getAdministrativeResourceResolver(null); + resolver = this.resourceResolverFactory.getServiceResourceResolver(null); final Resource baseResource = resolver.getResource(this.rootPath); // sanity check - should never be null @@ -332,7 +332,7 @@ public class DistributedEventReceiver ResourceResolver resolver = null; try { - resolver = this.resourceResolverFactory.getAdministrativeResourceResolver(null); + resolver = this.resourceResolverFactory.getServiceResourceResolver(null); final ResourceHelper.BatchResourceRemover brr = ResourceHelper.getBatchResourceRemover(50); final Resource baseResource = resolver.getResource(this.ownRootPath); Modified: sling/trunk/bundles/extensions/dea/src/main/java/org/apache/sling/event/dea/impl/DistributedEventSender.java URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/dea/src/main/java/org/apache/sling/event/dea/impl/DistributedEventSender.java?rev=1764446&r1=1764445&r2=1764446&view=diff ============================================================================== --- sling/trunk/bundles/extensions/dea/src/main/java/org/apache/sling/event/dea/impl/DistributedEventSender.java (original) +++ sling/trunk/bundles/extensions/dea/src/main/java/org/apache/sling/event/dea/impl/DistributedEventSender.java Wed Oct 12 12:30:45 2016 @@ -191,7 +191,7 @@ public class DistributedEventSender if ( path != null && path.length() > 0 && this.running ) { ResourceResolver resolver = null; try { - resolver = this.resourceResolverFactory.getAdministrativeResourceResolver(null); + resolver = this.resourceResolverFactory.getServiceResourceResolver(null); final Resource eventResource = resolver.getResource(path); if (eventResource == null) { this.logger.warn("runInBackground : resource not found at "+path);