You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ro...@apache.org on 2017/11/07 09:26:41 UTC
[sling-org-apache-sling-discovery-base] 02/07: SLING-5732 :
discovery : avoid empty commit when nothing has changed
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.discovery.base-1.1.6
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-discovery-base.git
commit 2e4b0452e673cf8bba671c0242f7d39dc34cfc97
Author: Stefan Egli <st...@apache.org>
AuthorDate: Mon Aug 15 13:25:18 2016 +0000
SLING-5732 : discovery : avoid empty commit when nothing has changed
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/discovery/base@1756382 13f79535-47bb-0310-9956-ffa450edef68
---
.../base/connectors/announcement/AnnouncementRegistryImpl.java | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/src/main/java/org/apache/sling/discovery/base/connectors/announcement/AnnouncementRegistryImpl.java b/src/main/java/org/apache/sling/discovery/base/connectors/announcement/AnnouncementRegistryImpl.java
index bb109a7..c983da7 100644
--- a/src/main/java/org/apache/sling/discovery/base/connectors/announcement/AnnouncementRegistryImpl.java
+++ b/src/main/java/org/apache/sling/discovery/base/connectors/announcement/AnnouncementRegistryImpl.java
@@ -493,6 +493,7 @@ public class AnnouncementRegistryImpl implements AnnouncementRegistry {
// instance's registry - and the repository must not
// contain any additional announcements
ResourceResolver resourceResolver = null;
+ boolean requiresCommit = false;
try {
resourceResolver = resourceResolverFactory
.getAdministrativeResourceResolver(null);
@@ -519,8 +520,11 @@ public class AnnouncementRegistryImpl implements AnnouncementRegistry {
// (SLING-4139)
ResourceHelper.deleteResource(resourceResolver,
res.getPath());
+ requiresCommit = true;
+ }
+ if (requiresCommit) {
+ resourceResolver.commit();
}
- resourceResolver.commit();
resourceResolver.close();
resourceResolver = null;
} catch (LoginException e) {
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.