You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by to...@apache.org on 2016/05/31 07:36:59 UTC

svn commit: r1746247 - /sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/transport/impl/SimpleHttpDistributionTransport.java

Author: tommaso
Date: Tue May 31 07:36:58 2016
New Revision: 1746247

URL: http://svn.apache.org/viewvc?rev=1746247&view=rev
Log:
This closes #144
commit e876de40c51cbcbc2f0aac41f3e0607b7c0c6ca2
Author: tmaret <tm...@adobe.com>
Date: 2016-05-30T15:34:30Z
SLING-5752 - SimpleHttpDistributionTransport does not leverage configured scheme from distribution endpoint
Pass scheme from distribution endpoint when building Executor's HttpHost

Modified:
    sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/transport/impl/SimpleHttpDistributionTransport.java

Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/transport/impl/SimpleHttpDistributionTransport.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/transport/impl/SimpleHttpDistributionTransport.java?rev=1746247&r1=1746246&r2=1746247&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/transport/impl/SimpleHttpDistributionTransport.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/transport/impl/SimpleHttpDistributionTransport.java Tue May 31 07:36:58 2016
@@ -160,9 +160,10 @@ public class SimpleHttpDistributionTrans
     private Executor authenticate(DistributionTransportSecret secret, Executor executor) {
         Map<String, String> credentialsMap = secret.asCredentialsMap();
         if (credentialsMap != null) {
-            executor = executor.auth(new HttpHost(distributionEndpoint.getUri().getHost(), distributionEndpoint.getUri().getPort()),
+            URI uri = distributionEndpoint.getUri();
+            executor = executor.auth(new HttpHost(uri.getHost(), uri.getPort(), uri.getScheme()),
                     credentialsMap.get(USERNAME), credentialsMap.get(PASSWORD)).authPreemptive(
-                    new HttpHost(distributionEndpoint.getUri().getHost(), distributionEndpoint.getUri().getPort()));
+                    new HttpHost(uri.getHost(), uri.getPort(), uri.getScheme()));
             log.debug("authenticate user={}, endpoint={}", secret.asCredentialsMap().get(USERNAME), distributionEndpoint.getUri());
         }
         return executor;