You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by mp...@apache.org on 2016/02/01 15:09:27 UTC

svn commit: r1727938 - in /sling/trunk/contrib/extensions/distribution: core/src/main/java/org/apache/sling/distribution/agent/impl/SimpleDistributionAgent.java it/src/test/java/org/apache/sling/distribution/it/DistributionIntegrationTestBase.java

Author: mpetria
Date: Mon Feb  1 14:09:26 2016
New Revision: 1727938

URL: http://svn.apache.org/viewvc?rev=1727938&view=rev
Log:
SLING-5472: fix distribution package leak

Modified:
    sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/SimpleDistributionAgent.java
    sling/trunk/contrib/extensions/distribution/it/src/test/java/org/apache/sling/distribution/it/DistributionIntegrationTestBase.java

Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/SimpleDistributionAgent.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/SimpleDistributionAgent.java?rev=1727938&r1=1727937&r2=1727938&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/SimpleDistributionAgent.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/SimpleDistributionAgent.java Mon Feb  1 14:09:26 2016
@@ -469,9 +469,10 @@ public class SimpleDistributionAgent imp
                 log.error("distribution package with id {} does not exist. the package will be skipped.", queueItem.getId());
             }
         } finally {
-            DistributionPackageUtils.closeSafely(distributionPackage);
             if (removeItemFromQueue) {
                 DistributionPackageUtils.releaseOrDelete(distributionPackage, queueName);
+            } else {
+                DistributionPackageUtils.closeSafely(distributionPackage);
             }
             ungetAgentResourceResolver(agentResourceResolver);
         }

Modified: sling/trunk/contrib/extensions/distribution/it/src/test/java/org/apache/sling/distribution/it/DistributionIntegrationTestBase.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/it/src/test/java/org/apache/sling/distribution/it/DistributionIntegrationTestBase.java?rev=1727938&r1=1727937&r2=1727938&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/it/src/test/java/org/apache/sling/distribution/it/DistributionIntegrationTestBase.java (original)
+++ sling/trunk/contrib/extensions/distribution/it/src/test/java/org/apache/sling/distribution/it/DistributionIntegrationTestBase.java Mon Feb  1 14:09:26 2016
@@ -107,12 +107,12 @@ public abstract class DistributionIntegr
     public static void checkNoPackagesLeft() throws IOException, JSONException {
 
 
-        assertEmptyFolder(author, authorClient, "/var/sling/distribution/packages/vlt/shared");
-        assertEmptyFolder(author, authorClient, "/var/sling/distribution/packages/vlt/data");
+        assertEmptyFolder(author, authorClient, "/var/sling/distribution/packages/default/shared");
+        assertEmptyFolder(author, authorClient, "/var/sling/distribution/packages/default/data");
         assertEmptyFolder(author, authorClient, "/etc/packages/sling/distribution");
 
-        assertEmptyFolder(author, authorClient, "/var/sling/distribution/packages/vlt/shared");
-        assertEmptyFolder(author, authorClient, "/var/sling/distribution/packages/vlt/data");
+        assertEmptyFolder(author, authorClient, "/var/sling/distribution/packages/default/shared");
+        assertEmptyFolder(author, authorClient, "/var/sling/distribution/packages/default/data");
         assertEmptyFolder(publish, publishClient, "/etc/packages/sling/distribution");
     }