svn commit: r1568912 - /sling/trunk/bundles/extensions/discovery/impl/src/main/java/org/apache/sling/discovery/impl/topology/announcement/AnnouncementRegistryImpl.java

[stefanegli]

Author: stefanegli
Date: Mon Feb 17 09:08:31 2014
New Revision: 1568912

URL: http://svn.apache.org/r1568912
Log:
SLING-3389 : removing unnecessary commit() calls

Modified:
    
sling/trunk/bundles/extensions/discovery/impl/src/main/java/org/apache/sling/discovery/impl/topology/announcement/AnnouncementRegistryImpl.java

Modified: 
sling/trunk/bundles/extensions/discovery/impl/src/main/java/org/apache/sling/discovery/impl/topology/announcement/AnnouncementRegistryImpl.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/discovery/impl/src/main/java/org/apache/sling/discovery/impl/topology/announcement/AnnouncementRegistryImpl.java?rev=1568912&r1=1568911&r2=1568912&view=diff
==============================================================================
--- 
sling/trunk/bundles/extensions/discovery/impl/src/main/java/org/apache/sling/discovery/impl/topology/announcement/AnnouncementRegistryImpl.java
 (original)
+++ 
sling/trunk/bundles/extensions/discovery/impl/src/main/java/org/apache/sling/discovery/impl/topology/announcement/AnnouncementRegistryImpl.java
 Mon Feb 17 09:08:31 2014
@@ -190,8 +190,8 @@ public class AnnouncementRegistryImpl im
                     // with the repository
                 }
             }
-
-            resourceResolver.commit();
+            // since SLING-3389 this method does only read operations, hence
+            // no commit necessary anymore - close happens in below finally 
block
         } catch (LoginException e) {
             logger.error(
                     "listAnnouncementsInSameCluster: could not log in 
administratively: " + e, e);
@@ -413,7 +413,8 @@ public class AnnouncementRegistryImpl im
                     
target.addIncomingTopologyAnnouncement(topologyAnnouncement);
                 }
             }
-            resourceResolver.commit();
+            // even before SLING-3389 this method only did read operations,
+            // hence no commit was ever necessary. The close happens in the 
finally block
         } catch (LoginException e) {
             logger.error(
                     "handleEvent: could not log in administratively: " + e, e);