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 2015/07/15 17:00:04 UTC
svn commit: r1691233 -
/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/servlet/DistributionPackageExporterServlet.java
Author: mpetria
Date: Wed Jul 15 15:00:04 2015
New Revision: 1691233
URL: http://svn.apache.org/r1691233
Log:
SLING-4651: fix error in if else statement for package exporter
Modified:
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/servlet/DistributionPackageExporterServlet.java
Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/servlet/DistributionPackageExporterServlet.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/servlet/DistributionPackageExporterServlet.java?rev=1691233&r1=1691232&r2=1691233&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/servlet/DistributionPackageExporterServlet.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/servlet/DistributionPackageExporterServlet.java Wed Jul 15 15:00:04 2015
@@ -55,14 +55,12 @@ public class DistributionPackageExporter
String operation = request.getParameter("operation");
-
-
try {
if ("delete".equals(operation)) {
deletePackage(request, response);
- } if ("fetch".equals(operation)) {
+ } else if ("fetch".equals(operation)) {
exportOnePackage(request, response, false);
@@ -117,6 +115,7 @@ public class DistributionPackageExporter
IOUtils.closeQuietly(inputStream);
}
+ String packageId = distributionPackage.getId();
if (delete) {
// delete the package permanently
distributionPackage.delete();
@@ -125,7 +124,7 @@ public class DistributionPackageExporter
// everything ok
response.setStatus(200);
- log.info("{} bytes written into the response", bytesCopied);
+ log.info("exported package {} was sent (and deleted={}), bytes written {}", new Object[] { packageId, delete, bytesCopied });
} else {
log.warn("fetched a null package");
}
@@ -160,6 +159,7 @@ public class DistributionPackageExporter
if (distributionPackage != null) {
distributionPackage.delete();
+ log.info("exported package {} was deleted", distributionPackage.getId());
response.setStatus(200);
} else {