You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by tm...@apache.org on 2019/04/26 20:06:24 UTC
[sling-org-apache-sling-distribution-journal] branch master
updated: SLING-8374 Missing out exceptions in catch clause in
DistributionSubscriber class
This is an automated email from the ASF dual-hosted git repository.
tmaret pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-distribution-journal.git
The following commit(s) were added to refs/heads/master by this push:
new dc53cb0 SLING-8374 Missing out exceptions in catch clause in DistributionSubscriber class
new c2ff042 Merge pull request #4 from akrainiouk/SLING-8374
dc53cb0 is described below
commit dc53cb020e4b524cbca68ef82e512bca1705f292
Author: Alexei Krainiouk <ak...@adobe.com>
AuthorDate: Fri Apr 26 12:40:20 2019 -0700
SLING-8374 Missing out exceptions in catch clause in DistributionSubscriber class
---
.../journal/impl/subscriber/DistributionSubscriber.java | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/src/main/java/org/apache/sling/distribution/journal/impl/subscriber/DistributionSubscriber.java b/src/main/java/org/apache/sling/distribution/journal/impl/subscriber/DistributionSubscriber.java
index 4eb0050..12d1eae 100644
--- a/src/main/java/org/apache/sling/distribution/journal/impl/subscriber/DistributionSubscriber.java
+++ b/src/main/java/org/apache/sling/distribution/journal/impl/subscriber/DistributionSubscriber.java
@@ -58,6 +58,7 @@ import javax.jcr.Session;
import javax.jcr.ValueFactory;
import org.apache.sling.commons.osgi.PropertiesUtil;
+import org.apache.sling.distribution.journal.MessagingException;
import org.apache.sling.distribution.journal.impl.shared.DistributionMetricsService;
import org.apache.sling.distribution.journal.impl.shared.SimpleDistributionResponse;
import org.apache.sling.distribution.journal.impl.shared.Topics;
@@ -552,8 +553,12 @@ public class DistributionSubscriber implements DistributionAgent {
Event event = DistributionEvent.eventImporterImported(pkgMsg, subAgentName);
eventAdmin.postEvent(event);
- } catch (Exception e) {
+ } catch (Throwable e) {
distributionMetricsService.getFailedPackageImports().mark();
+ // rethrow fatal exceptions
+ if (e instanceof Error) {
+ throw (Error) e;
+ }
int retries = packageRetries.get(pubAgentName);
if (errorQueueEnabled && retries >= maxRetries) {
LOG.warn(format("Failed to import distribution package %s at offset %s after %s retries, removing the package.", pkgMsg.getPkgId(), offset, retries));