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/03/03 16:13:17 UTC
svn commit: r1733477 -
/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/transport/impl/SimpleHttpDistributionTransport.java
Author: tommaso
Date: Thu Mar 3 15:13:17 2016
New Revision: 1733477
URL: http://svn.apache.org/viewvc?rev=1733477&view=rev
Log:
SLING-5581 - switching back to returnContent which already does what we need
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=1733477&r1=1733476&r2=1733477&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 Thu Mar 3 15:13:17 2016
@@ -89,7 +89,6 @@ public class SimpleHttpDistributionTrans
log.debug("skipping distribution of package {}Â to same origin {}", distributionPackage.getId(), hostAndPort);
} else {
- Response response = null;
try {
Executor executor = getExecutor(distributionContext);
@@ -101,18 +100,10 @@ public class SimpleHttpDistributionTrans
req = req.bodyStream(inputStream, ContentType.APPLICATION_OCTET_STREAM);
- response = executor.execute(req);
+ Response response = executor.execute(req);
+ response.returnContent();
- HttpResponse httpResponse = response.returnResponse();
- StatusLine statusLine = httpResponse.getStatusLine();
-
- if (statusLine.getStatusCode() != 200) {
- throw new DistributionException(statusLine.toString());
- }
} finally {
- if (response != null) {
- response.discardContent();
- }
IOUtils.closeQuietly(inputStream);
}