npeltier closed pull request #10: SLING-7902 Fix for http.conn.timeout not
being read from the configs.
URL: https://github.com/apache/sling-org-apache-sling-distribution-core/pull/10
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git
a/src/main/java/org/apache/sling/distribution/agent/impl/ForwardDistributionAgentFactory.java
b/src/main/java/org/apache/sling/distribution/agent/impl/ForwardDistributionAgentFactory.java
index 5473ed7..c57b421 100644
---
a/src/main/java/org/apache/sling/distribution/agent/impl/ForwardDistributionAgentFactory.java
+++
b/src/main/java/org/apache/sling/distribution/agent/impl/ForwardDistributionAgentFactory.java
@@ -246,7 +246,7 @@ protected SimpleDistributionAgent createAgent(String
agentName, BundleContext co
Map<String, String> priorityQueues =
PropertiesUtil.toMap(config.get(PRIORITY_QUEUES), new String[0]);
priorityQueues = SettingsUtils.removeEmptyEntries(priorityQueues);
- Integer timeout = PropertiesUtil.toInteger(HTTP, 10) * 1000;
+ Integer timeout = PropertiesUtil.toInteger(config.get(HTTP), 10) *
1000;
HttpConfiguration httpConfiguration = new HttpConfiguration(timeout);
DistributionPackageExporter packageExporter = new
LocalDistributionPackageExporter(packageBuilder);
diff --git
a/src/main/java/org/apache/sling/distribution/agent/impl/ReverseDistributionAgentFactory.java
b/src/main/java/org/apache/sling/distribution/agent/impl/ReverseDistributionAgentFactory.java
index 31f2ad2..49db09c 100644
---
a/src/main/java/org/apache/sling/distribution/agent/impl/ReverseDistributionAgentFactory.java
+++
b/src/main/java/org/apache/sling/distribution/agent/impl/ReverseDistributionAgentFactory.java
@@ -194,7 +194,7 @@ protected SimpleDistributionAgent createAgent(String
agentName, BundleContext co
int pullItems = PropertiesUtil.toInteger(config.get(PULL_ITEMS),
Integer.MAX_VALUE);
- Integer timeout = PropertiesUtil.toInteger(HTTP, 10) * 1000;
+ Integer timeout = PropertiesUtil.toInteger(config.get(HTTP), 10) *
1000;
HttpConfiguration httpConfiguration = new HttpConfiguration(timeout);
DistributionPackageExporter packageExporter = new
RemoteDistributionPackageExporter(distributionLog, packageBuilder,
diff --git
a/src/main/java/org/apache/sling/distribution/agent/impl/SyncDistributionAgentFactory.java
b/src/main/java/org/apache/sling/distribution/agent/impl/SyncDistributionAgentFactory.java
index 337b653..1aa283c 100644
---
a/src/main/java/org/apache/sling/distribution/agent/impl/SyncDistributionAgentFactory.java
+++
b/src/main/java/org/apache/sling/distribution/agent/impl/SyncDistributionAgentFactory.java
@@ -231,7 +231,7 @@ protected SimpleDistributionAgent createAgent(String
agentName, BundleContext co
String[] queueNames = queuesMap.toArray(new String[queuesMap.size()]);
exportQueueStrategy = new MultipleQueueDispatchingStrategy(queueNames);
- Integer timeout = PropertiesUtil.toInteger(HTTP, 10) * 1000;
+ Integer timeout = PropertiesUtil.toInteger(config.get(HTTP), 10) *
1000;
HttpConfiguration httpConfiguration = new HttpConfiguration(timeout);
packageImporter = new
RemoteDistributionPackageImporter(distributionLog, transportSecretProvider,
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
