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

[mpetria]

Author: mpetria
Date: Sat Mar 28 12:29:18 2015
New Revision: 1669754

URL: http://svn.apache.org/r1669754
Log:
SLING-4550: do not drop last distribution package in a pull series

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=1669754&r1=1669753&r2=1669754&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
 Sat Mar 28 12:29:18 2015
@@ -147,14 +147,15 @@ public class SimpleHttpDistributionTrans
             try {
 
                 int pulls = 0;
-                while ((httpResponse = executor.execute(req).returnResponse())
-                        .getStatusLine().getStatusCode() == 200
-                        && pulls < maxNumberOfPackages) {
+                while (pulls < maxNumberOfPackages
+                        && (httpResponse = 
executor.execute(req).returnResponse()).getStatusLine().getStatusCode() == 200) 
{
                     HttpEntity entity = httpResponse.getEntity();
                     if (entity != null) {
                         final DistributionPackage responsePackage = 
packageBuilder.readPackage(resourceResolver, entity.getContent());
                         if (responsePackage != null) {
                             
responsePackage.getInfo().setOrigin(distributionURI);
+                            log.debug("pulled package no {} with info {}", 
pulls, responsePackage.getInfo());
+
                             result.add(responsePackage);
                         } else {
                             log.warn("responsePackage is null");