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 2018/06/19 11:28:46 UTC
[sling-org-apache-sling-distribution-core] branch master updated
(bf1a829 -> 07a4c30)
This is an automated email from the ASF dual-hosted git repository.
mpetria pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-distribution-core.git.
from bf1a829 SLING-7168: expose spi for agent+queue+packaging
new d5b443f Revert "SLING-7168: expose spi for agent+queue+packaging"
new 07a4c30 SLING-7747: send http response error code when package cannot be opened
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
pom.xml | 8 +-------
.../packaging/impl/FileDistributionPackageBuilder.java | 6 +++++-
.../packaging/impl/exporter/AgentDistributionPackageExporter.java | 2 --
.../distribution/servlet/DistributionPackageExporterServlet.java | 2 +-
4 files changed, 7 insertions(+), 11 deletions(-)
[sling-org-apache-sling-distribution-core] 01/02: Revert
"SLING-7168: expose spi for agent+queue+packaging"
Posted by mp...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
mpetria pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-distribution-core.git
commit d5b443f37c04940b51ea692ae5596dfa0c7cd5f8
Author: Marius Petria <mp...@adobe.com>
AuthorDate: Tue Jun 19 14:09:51 2018 +0300
Revert "SLING-7168: expose spi for agent+queue+packaging"
This reverts commit bf1a8294229a60b74acb44d026f816739c8c5e0a.
---
pom.xml | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
diff --git a/pom.xml b/pom.xml
index 123393b..8e19597 100644
--- a/pom.xml
+++ b/pom.xml
@@ -71,13 +71,7 @@
<Export-Package>
org.apache.sling.distribution.util,
org.apache.sling.distribution.common,
- org.apache.sling.distribution.serialization,
- org.apache.sling.distribution.queue.spi,
- org.apache.sling.distribution.queue,
- org.apache.sling.distribution.log.spi,
- org.apache.sling.distribution.agent,
- org.apache.sling.distribution.agent.spi,
- org.apache.sling.distribution.packaging
+ org.apache.sling.distribution.serialization
</Export-Package>
<Import-Package>
org.apache.http.nio.*;resolution:=optional,
[sling-org-apache-sling-distribution-core] 02/02: SLING-7747: send
http response error code when package cannot be opened
Posted by mp...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
mpetria pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-distribution-core.git
commit 07a4c30adb053e8b4181736cd61ce28acf23e6e6
Author: Marius Petria <mp...@adobe.com>
AuthorDate: Tue Jun 19 14:28:33 2018 +0300
SLING-7747: send http response error code when package cannot be opened
---
.../distribution/packaging/impl/FileDistributionPackageBuilder.java | 6 +++++-
.../packaging/impl/exporter/AgentDistributionPackageExporter.java | 2 --
.../distribution/servlet/DistributionPackageExporterServlet.java | 2 +-
3 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/main/java/org/apache/sling/distribution/packaging/impl/FileDistributionPackageBuilder.java b/src/main/java/org/apache/sling/distribution/packaging/impl/FileDistributionPackageBuilder.java
index 66fd0b3..3248e88 100644
--- a/src/main/java/org/apache/sling/distribution/packaging/impl/FileDistributionPackageBuilder.java
+++ b/src/main/java/org/apache/sling/distribution/packaging/impl/FileDistributionPackageBuilder.java
@@ -164,6 +164,10 @@ public class FileDistributionPackageBuilder extends AbstractDistributionPackageB
@Override
protected DistributionPackage getPackageInternal(@Nonnull ResourceResolver resourceResolver, @Nonnull String id) {
- return new FileDistributionPackage(new File(tempDirectory, id), getType(), null, null);
+ File file = new File(tempDirectory, id);
+ if (!file.exists()) {
+ return null;
+ }
+ return new FileDistributionPackage(file, getType(), null, null);
}
}
diff --git a/src/main/java/org/apache/sling/distribution/packaging/impl/exporter/AgentDistributionPackageExporter.java b/src/main/java/org/apache/sling/distribution/packaging/impl/exporter/AgentDistributionPackageExporter.java
index 6662b13..272227e 100644
--- a/src/main/java/org/apache/sling/distribution/packaging/impl/exporter/AgentDistributionPackageExporter.java
+++ b/src/main/java/org/apache/sling/distribution/packaging/impl/exporter/AgentDistributionPackageExporter.java
@@ -113,8 +113,6 @@ public class AgentDistributionPackageExporter implements DistributionPackageExpo
}
}
- } catch (Exception ex) {
- log.error("Error exporting package", ex);
} finally {
DistributionPackageUtils.closeSafely(distributionPackage);
}
diff --git a/src/main/java/org/apache/sling/distribution/servlet/DistributionPackageExporterServlet.java b/src/main/java/org/apache/sling/distribution/servlet/DistributionPackageExporterServlet.java
index c7ba4de..9c98878 100644
--- a/src/main/java/org/apache/sling/distribution/servlet/DistributionPackageExporterServlet.java
+++ b/src/main/java/org/apache/sling/distribution/servlet/DistributionPackageExporterServlet.java
@@ -107,7 +107,7 @@ public class DistributionPackageExporterServlet extends SlingAllMethodsServlet {
bytesCopied = IOUtils.copy(inputStream, response.getOutputStream());
} catch (IOException e) {
- log.error("cannot process package", e);
+ throw new RuntimeException("cannot process package", e);
} finally {
IOUtils.closeQuietly(inputStream);
}