You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by bd...@apache.org on 2017/06/09 13:52:59 UTC

svn commit: r1798218 - /sling/trunk/bundles/extensions/healthcheck/api/src/main/java/org/apache/sling/hc/util/HealthCheckMetadata.java

Author: bdelacretaz
Date: Fri Jun  9 13:52:59 2017
New Revision: 1798218

URL: http://svn.apache.org/viewvc?rev=1798218&view=rev
Log:
SLING-6855 - accept String as well for WARNINGS_STICK_FOR_MINUTES (could do the same for other values but lets minimize changes)

Modified:
    sling/trunk/bundles/extensions/healthcheck/api/src/main/java/org/apache/sling/hc/util/HealthCheckMetadata.java

Modified: sling/trunk/bundles/extensions/healthcheck/api/src/main/java/org/apache/sling/hc/util/HealthCheckMetadata.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/healthcheck/api/src/main/java/org/apache/sling/hc/util/HealthCheckMetadata.java?rev=1798218&r1=1798217&r2=1798218&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/healthcheck/api/src/main/java/org/apache/sling/hc/util/HealthCheckMetadata.java (original)
+++ sling/trunk/bundles/extensions/healthcheck/api/src/main/java/org/apache/sling/hc/util/HealthCheckMetadata.java Fri Jun  9 13:52:59 2017
@@ -59,10 +59,20 @@ public class HealthCheckMetadata {
         this.tags = arrayPropertyToListOfStr(ref.getProperty(HealthCheck.TAGS));
         this.asyncCronExpression = (String) ref.getProperty(HealthCheck.ASYNC_CRON_EXPRESSION);
         this.resultCacheTtlInMs = (Long)ref.getProperty(HealthCheck.RESULT_CACHE_TTL_IN_MS);
-        this.warningsStickForMinutes = (Long) ref.getProperty(HealthCheck.WARNINGS_STICK_FOR_MINUTES);
+        this.warningsStickForMinutes = toLong(ref.getProperty(HealthCheck.WARNINGS_STICK_FOR_MINUTES));
         this.serviceReference = ref;
     }
 
+    private Long toLong(Object configValue) {
+        if(configValue == null) {
+            return null;
+        }
+        if(configValue instanceof Long) {
+            return (Long)configValue;
+        }
+        return Long.valueOf(configValue.toString());
+    }
+    
     /**
      * The name of the health check as defined through the {@link HealthCheck#NAME}
      * property.