This is an automated email from the ASF dual-hosted git repository.
cschneider 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 b921928 SLING-9533 - Set pkgType earlier to avoid NPE
b921928 is described below
commit b92192876d0abcbf93ab4bc1a5d4d786f8d21ad9
Author: Christian Schneider <[email protected]>
AuthorDate: Thu Jun 18 16:54:46 2020 +0200
SLING-9533 - Set pkgType earlier to avoid NPE
---
.../distribution/journal/impl/subscriber/DistributionSubscriber.java | 2 +-
1 file changed, 1 insertion(+), 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 e30ff59..8bde940 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
@@ -197,6 +197,7 @@ public class DistributionSubscriber implements
DistributionAgent {
queueNames = getNotEmpty(config.agentNames());
int maxRetries = config.maxRetries();
boolean editable = config.editable();
+ pkgType = requireNonNull(packageBuilder.getType());
ContentPackageExtractor extractor = new
ContentPackageExtractor(packaging, config.packageHandling());
PackageHandler packageHandler = new PackageHandler(packageBuilder,
extractor);
@@ -218,7 +219,6 @@ public class DistributionSubscriber implements
DistributionAgent {
announcer = new Announcer(subSlingId, subAgentName, queueNames,
sender(topics.getDiscoveryTopic()), bookKeeper,
maxRetries, config.editable(), announceDelay);
- pkgType = requireNonNull(packageBuilder.getType());
boolean errorQueueEnabled = (maxRetries >= 0);
String msg = format(
"Started Subscriber agent %s at offset %s, subscribed to agent
names %s with package builder %s editable %s maxRetries %s errorQueueEnabled
%s",
