svn commit: r1600565 - in /sling/trunk/bundles/extensions/healthcheck/core/src: main/java/org/apache/sling/hc/core/impl/CompositeHealthCheck.java test/java/org/apache/sling/hc/core/impl/CompositeHealthCheckTest.java

[bdelacretaz]

Author: bdelacretaz
Date: Thu Jun  5 07:09:20 2014
New Revision: 1600565

URL: http://svn.apache.org/r1600565
Log:
SLING-3500 - minor tweaks

Modified:
    
sling/trunk/bundles/extensions/healthcheck/core/src/main/java/org/apache/sling/hc/core/impl/CompositeHealthCheck.java
    
sling/trunk/bundles/extensions/healthcheck/core/src/test/java/org/apache/sling/hc/core/impl/CompositeHealthCheckTest.java

Modified: 
sling/trunk/bundles/extensions/healthcheck/core/src/main/java/org/apache/sling/hc/core/impl/CompositeHealthCheck.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/healthcheck/core/src/main/java/org/apache/sling/hc/core/impl/CompositeHealthCheck.java?rev=1600565&r1=1600564&r2=1600565&view=diff
==============================================================================
--- 
sling/trunk/bundles/extensions/healthcheck/core/src/main/java/org/apache/sling/hc/core/impl/CompositeHealthCheck.java
 (original)
+++ 
sling/trunk/bundles/extensions/healthcheck/core/src/main/java/org/apache/sling/hc/core/impl/CompositeHealthCheck.java
 Thu Jun  5 07:09:20 2014
@@ -110,8 +110,8 @@ public class CompositeHealthCheck implem
     @Override
     public Result execute() {
 
-        Result result = null;
-        if ((result = checkForRecursion(referenceToThis, new 
HashSet<String>())) != null) {
+        Result result = checkForRecursion(referenceToThis, new 
HashSet<String>());
+        if(result != null) {
             // return recursion error
             return result;
         }

Modified: 
sling/trunk/bundles/extensions/healthcheck/core/src/test/java/org/apache/sling/hc/core/impl/CompositeHealthCheckTest.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/healthcheck/core/src/test/java/org/apache/sling/hc/core/impl/CompositeHealthCheckTest.java?rev=1600565&r1=1600564&r2=1600565&view=diff
==============================================================================
--- 
sling/trunk/bundles/extensions/healthcheck/core/src/test/java/org/apache/sling/hc/core/impl/CompositeHealthCheckTest.java
 (original)
+++ 
sling/trunk/bundles/extensions/healthcheck/core/src/test/java/org/apache/sling/hc/core/impl/CompositeHealthCheckTest.java
 Thu Jun  5 07:09:20 2014
@@ -91,7 +91,7 @@ public class CompositeHealthCheckTest {
     }
 
     @Test
-    public void testRecursionCheckSimle() {
+    public void testSimpleRecursion() {
 
         // composite check referencing itself
         final String[] filterTags = new String[] { "check1" };
@@ -123,7 +123,7 @@ public class CompositeHealthCheckTest {
     }
 
     @Test
-    public void testRecursionCheckCyclic() {
+    public void testCyclicRecursion() {
 
         // three checks, cyclic
         final String[] filterTags = new String[] { "check2" };