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 2015/10/29 14:55:55 UTC
svn commit: r1711255 - in /sling/trunk/bundles/extensions/discovery/impl/src: main/java/org/apache/sling/discovery/impl/Config.java test/java/org/apache/sling/discovery/impl/setup/TestConfig.java

Author: stefanegli
Date: Thu Oct 29 13:55:55 2015
New Revision: 1711255

URL: http://svn.apache.org/viewvc?rev=1711255&view=rev
Log:
SLING-5195 related : avoid duplicate, shadowing fields

Modified:
    sling/trunk/bundles/extensions/discovery/impl/src/main/java/org/apache/sling/discovery/impl/Config.java
    sling/trunk/bundles/extensions/discovery/impl/src/test/java/org/apache/sling/discovery/impl/setup/TestConfig.java

Modified: sling/trunk/bundles/extensions/discovery/impl/src/main/java/org/apache/sling/discovery/impl/Config.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/discovery/impl/src/main/java/org/apache/sling/discovery/impl/Config.java?rev=1711255&r1=1711254&r2=1711255&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/discovery/impl/src/main/java/org/apache/sling/discovery/impl/Config.java (original)
+++ sling/trunk/bundles/extensions/discovery/impl/src/main/java/org/apache/sling/discovery/impl/Config.java Thu Oct 29 13:55:55 2015
@@ -62,19 +62,19 @@ public class Config implements BaseConfi
     public static final long DEFAULT_HEARTBEAT_TIMEOUT = 120;
     @Property(longValue=DEFAULT_HEARTBEAT_TIMEOUT)
     public static final String HEARTBEAT_TIMEOUT_KEY = "heartbeatTimeout";
-    private long heartbeatTimeout = DEFAULT_HEARTBEAT_TIMEOUT;
+    protected long heartbeatTimeout = DEFAULT_HEARTBEAT_TIMEOUT;
 
     /** Configure the interval (in seconds) according to which the heartbeats are exchanged in the topology. */
     public static final long DEFAULT_HEARTBEAT_INTERVAL = 30;
     @Property(longValue=DEFAULT_HEARTBEAT_INTERVAL)
     public static final String HEARTBEAT_INTERVAL_KEY = "heartbeatInterval";
-    private long heartbeatInterval = DEFAULT_HEARTBEAT_INTERVAL;
+    protected long heartbeatInterval = DEFAULT_HEARTBEAT_INTERVAL;
 
     /** Configure the time (in seconds) which must be passed at minimum between sending TOPOLOGY_CHANGING/_CHANGED (avoid flooding). */
     public static final int DEFAULT_MIN_EVENT_DELAY = 3;
     @Property(intValue=DEFAULT_MIN_EVENT_DELAY)
     public static final String MIN_EVENT_DELAY_KEY = "minEventDelay";
-    private int minEventDelay = DEFAULT_MIN_EVENT_DELAY;
+    protected int minEventDelay = DEFAULT_MIN_EVENT_DELAY;
 
     /** Configure the socket connect timeout for topology connectors. */
     public static final int DEFAULT_CONNECTION_TIMEOUT = 10;

Modified: sling/trunk/bundles/extensions/discovery/impl/src/test/java/org/apache/sling/discovery/impl/setup/TestConfig.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/discovery/impl/src/test/java/org/apache/sling/discovery/impl/setup/TestConfig.java?rev=1711255&r1=1711254&r2=1711255&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/discovery/impl/src/test/java/org/apache/sling/discovery/impl/setup/TestConfig.java (original)
+++ sling/trunk/bundles/extensions/discovery/impl/src/test/java/org/apache/sling/discovery/impl/setup/TestConfig.java Thu Oct 29 13:55:55 2015
@@ -26,14 +26,14 @@ import org.apache.sling.discovery.impl.C
 
 public class TestConfig extends Config implements ModifiableTestBaseConfig {
 
-    long heartbeatTimeout = 20;
-    long heartbeatInterval = 20;
-    int minEventDelay = 1;
     List<String> whitelist;
     private String drPath;
     
     public TestConfig(String path) {
         this.drPath = path;
+        heartbeatTimeout = 20;
+        heartbeatInterval = 20;
+        minEventDelay = 1;
     }
     
     @Override