You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by st...@apache.org on 2016/08/15 13:25:18 UTC
svn commit: r1756382 -
/sling/trunk/bundles/extensions/discovery/base/src/main/java/org/apache/sling/discovery/base/connectors/announcement/AnnouncementRegistryImpl.java
Author: stefanegli
Date: Mon Aug 15 13:25:18 2016
New Revision: 1756382
URL: http://svn.apache.org/viewvc?rev=1756382&view=rev
Log:
SLING-5732 : discovery : avoid empty commit when nothing has changed
Modified:
sling/trunk/bundles/extensions/discovery/base/src/main/java/org/apache/sling/discovery/base/connectors/announcement/AnnouncementRegistryImpl.java
Modified: sling/trunk/bundles/extensions/discovery/base/src/main/java/org/apache/sling/discovery/base/connectors/announcement/AnnouncementRegistryImpl.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/discovery/base/src/main/java/org/apache/sling/discovery/base/connectors/announcement/AnnouncementRegistryImpl.java?rev=1756382&r1=1756381&r2=1756382&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/discovery/base/src/main/java/org/apache/sling/discovery/base/connectors/announcement/AnnouncementRegistryImpl.java (original)
+++ sling/trunk/bundles/extensions/discovery/base/src/main/java/org/apache/sling/discovery/base/connectors/announcement/AnnouncementRegistryImpl.java Mon Aug 15 13:25:18 2016
@@ -493,6 +493,7 @@ public class AnnouncementRegistryImpl im
// 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 im
// (SLING-4139)
ResourceHelper.deleteResource(resourceResolver,
res.getPath());
+ requiresCommit = true;
+ }
+ if (requiresCommit) {
+ resourceResolver.commit();
}
- resourceResolver.commit();
resourceResolver.close();
resourceResolver = null;
} catch (LoginException e) {