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/20 16:44:28 UTC
svn commit: r1709617 - in /sling/trunk/bundles/extensions/discovery:
base/src/main/java/org/apache/sling/discovery/base/connectors/
base/src/main/java/org/apache/sling/discovery/base/connectors/ping/
base/src/test/java/org/apache/sling/discovery/base/i...
Author: stefanegli
Date: Tue Oct 20 14:44:27 2015
New Revision: 1709617
URL: http://svn.apache.org/viewvc?rev=1709617&view=rev
Log:
SLING-5173 : fixed getSocketConnectionTimeout to a more proper getSocketConnectTimeout
Modified:
sling/trunk/bundles/extensions/discovery/base/src/main/java/org/apache/sling/discovery/base/connectors/BaseConfig.java
sling/trunk/bundles/extensions/discovery/base/src/main/java/org/apache/sling/discovery/base/connectors/ping/TopologyConnectorClient.java
sling/trunk/bundles/extensions/discovery/base/src/test/java/org/apache/sling/discovery/base/its/setup/mock/SimpleConnectorConfig.java
sling/trunk/bundles/extensions/discovery/impl/src/main/java/org/apache/sling/discovery/impl/Config.java
Modified: sling/trunk/bundles/extensions/discovery/base/src/main/java/org/apache/sling/discovery/base/connectors/BaseConfig.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/discovery/base/src/main/java/org/apache/sling/discovery/base/connectors/BaseConfig.java?rev=1709617&r1=1709616&r2=1709617&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/discovery/base/src/main/java/org/apache/sling/discovery/base/connectors/BaseConfig.java (original)
+++ sling/trunk/bundles/extensions/discovery/base/src/main/java/org/apache/sling/discovery/base/connectors/BaseConfig.java Tue Oct 20 14:44:27 2015
@@ -29,7 +29,7 @@ public interface BaseConfig {
* Returns the socket connect() timeout used by the topology connector, 0 disables the timeout
* @return the socket connect() timeout used by the topology connector, 0 disables the timeout
*/
- public int getSocketConnectionTimeout();
+ public int getSocketConnectTimeout();
/**
* Returns the socket read timeout (SO_TIMEOUT) used by the topology connector, 0 disables the timeout
Modified: sling/trunk/bundles/extensions/discovery/base/src/main/java/org/apache/sling/discovery/base/connectors/ping/TopologyConnectorClient.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/discovery/base/src/main/java/org/apache/sling/discovery/base/connectors/ping/TopologyConnectorClient.java?rev=1709617&r1=1709616&r2=1709617&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/discovery/base/src/main/java/org/apache/sling/discovery/base/connectors/ping/TopologyConnectorClient.java (original)
+++ sling/trunk/bundles/extensions/discovery/base/src/main/java/org/apache/sling/discovery/base/connectors/ping/TopologyConnectorClient.java Tue Oct 20 14:44:27 2015
@@ -166,7 +166,7 @@ public class TopologyConnectorClient imp
// setting the connection timeout (idle connection, configured in seconds)
putRequest.setConfig(RequestConfig.
custom().
- setConnectTimeout(1000*config.getSocketConnectionTimeout()).
+ setConnectTimeout(1000*config.getSocketConnectTimeout()).
build());
Announcement resultingAnnouncement = null;
@@ -460,7 +460,7 @@ public class TopologyConnectorClient imp
// setting the connection timeout (idle connection, configured in seconds)
deleteRequest.setConfig(RequestConfig.
custom().
- setConnectTimeout(1000*config.getSocketConnectionTimeout()).
+ setConnectTimeout(1000*config.getSocketConnectTimeout()).
build());
try {
Modified: sling/trunk/bundles/extensions/discovery/base/src/test/java/org/apache/sling/discovery/base/its/setup/mock/SimpleConnectorConfig.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/discovery/base/src/test/java/org/apache/sling/discovery/base/its/setup/mock/SimpleConnectorConfig.java?rev=1709617&r1=1709616&r2=1709617&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/discovery/base/src/test/java/org/apache/sling/discovery/base/its/setup/mock/SimpleConnectorConfig.java (original)
+++ sling/trunk/bundles/extensions/discovery/base/src/test/java/org/apache/sling/discovery/base/its/setup/mock/SimpleConnectorConfig.java Tue Oct 20 14:44:27 2015
@@ -45,7 +45,7 @@ public class SimpleConnectorConfig imple
private int minEventDelay;
@Override
- public int getSocketConnectionTimeout() {
+ public int getSocketConnectTimeout() {
return connectionTimeout;
}
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=1709617&r1=1709616&r2=1709617&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 Tue Oct 20 14:44:27 2015
@@ -340,7 +340,7 @@ public class Config implements BaseConfi
* Returns the socket connect() timeout used by the topology connector, 0 disables the timeout
* @return the socket connect() timeout used by the topology connector, 0 disables the timeout
*/
- public int getSocketConnectionTimeout() {
+ public int getSocketConnectTimeout() {
return connectionTimeout;
}