svn commit: r1617708 - in /sling/trunk/bundles/extensions/discovery/impl/src/main/java/org/apache/sling/discovery/impl: cluster/voting/VotingHandler.java common/View.java common/ViewHelper.java

[stefanegli]

Author: stefanegli
Date: Wed Aug 13 12:13:27 2014
New Revision: 1617708

URL: http://svn.apache.org/r1617708
Log:
SLING-3843 : lower log level on remove-exception from error to info for 
cleanupTimedoutVotings

Modified:
    
sling/trunk/bundles/extensions/discovery/impl/src/main/java/org/apache/sling/discovery/impl/cluster/voting/VotingHandler.java
    
sling/trunk/bundles/extensions/discovery/impl/src/main/java/org/apache/sling/discovery/impl/common/View.java
    
sling/trunk/bundles/extensions/discovery/impl/src/main/java/org/apache/sling/discovery/impl/common/ViewHelper.java

Modified: 
sling/trunk/bundles/extensions/discovery/impl/src/main/java/org/apache/sling/discovery/impl/cluster/voting/VotingHandler.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/discovery/impl/src/main/java/org/apache/sling/discovery/impl/cluster/voting/VotingHandler.java?rev=1617708&r1=1617707&r2=1617708&view=diff
==============================================================================
--- 
sling/trunk/bundles/extensions/discovery/impl/src/main/java/org/apache/sling/discovery/impl/cluster/voting/VotingHandler.java
 (original)
+++ 
sling/trunk/bundles/extensions/discovery/impl/src/main/java/org/apache/sling/discovery/impl/cluster/voting/VotingHandler.java
 Wed Aug 13 12:13:27 2014
@@ -185,7 +185,7 @@ public class VotingHandler implements Ev
                        logger.debug("analyzeVotings: there were no votes for 
my voting, so I have to remove it: "
                                + ongoingVotingRes);
                }
-                ongoingVotingRes.remove();
+                ongoingVotingRes.remove(true);
                 it.remove();
             }
         }
@@ -280,7 +280,7 @@ public class VotingHandler implements Ev
             VotingView timedoutVotingRes = it.next();
             if (timedoutVotingRes!=null) {
                 logger.info("cleanupTimedoutVotings: removing a timed out 
voting: "+timedoutVotingRes);
-                timedoutVotingRes.remove();
+                timedoutVotingRes.remove(false);
             }
         }
     }

Modified: 
sling/trunk/bundles/extensions/discovery/impl/src/main/java/org/apache/sling/discovery/impl/common/View.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/discovery/impl/src/main/java/org/apache/sling/discovery/impl/common/View.java?rev=1617708&r1=1617707&r2=1617708&view=diff
==============================================================================
--- 
sling/trunk/bundles/extensions/discovery/impl/src/main/java/org/apache/sling/discovery/impl/common/View.java
 (original)
+++ 
sling/trunk/bundles/extensions/discovery/impl/src/main/java/org/apache/sling/discovery/impl/common/View.java
 Wed Aug 13 12:13:27 2014
@@ -137,13 +137,17 @@ public class View {
     /**
      * Delete this view from the repository
      */
-    public void remove() {
+    public void remove(boolean logErrorOnFailure) {
         final ResourceResolver resourceResolver = 
getResource().getResourceResolver();
         try{
             resourceResolver.delete(getResource());
             resourceResolver.commit();
         } catch(PersistenceException pe) {
-            logger.error("remove: Could not remove node: " + pe, pe);
+            if (logErrorOnFailure) {
+                logger.error("remove: Could not remove node: " + pe, pe);
+            } else {
+                logger.info("remove: Could not remove node: "+pe);
+            }
             resourceResolver.refresh();
         }
     }

Modified: 
sling/trunk/bundles/extensions/discovery/impl/src/main/java/org/apache/sling/discovery/impl/common/ViewHelper.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/discovery/impl/src/main/java/org/apache/sling/discovery/impl/common/ViewHelper.java?rev=1617708&r1=1617707&r2=1617708&view=diff
==============================================================================
--- 
sling/trunk/bundles/extensions/discovery/impl/src/main/java/org/apache/sling/discovery/impl/common/ViewHelper.java
 (original)
+++ 
sling/trunk/bundles/extensions/discovery/impl/src/main/java/org/apache/sling/discovery/impl/common/ViewHelper.java
 Wed Aug 13 12:13:27 2014
@@ -106,7 +106,7 @@ public class ViewHelper {
         while (true) {
             logger.error("getEstablishedView: more than one established view 
encountered! Removing: "
                     + establishedView);
-            new View(establishedView).remove();
+            new View(establishedView).remove(false);
             if (!it.hasNext()) {
                 return null;
             }