Merge pull request #10 from addy0001/SLING-7902
SLING-7902 Fix for http.conn.timeout not being read from the configs.
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 @@
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 @@
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 @@
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,
