You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by cs...@apache.org on 2020/03/17 11:32:47 UTC
[sling-org-apache-sling-distribution-journal] branch master
updated: SLING-9050 - Small refactoring
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 8132d40 SLING-9050 - Small refactoring
8132d40 is described below
commit 8132d405fe6010b73e9ea58e896138936e714376
Author: Christian Schneider <cs...@adobe.com>
AuthorDate: Tue Mar 17 12:32:30 2020 +0100
SLING-9050 - Small refactoring
---
.../impl/subscriber/ContentPackageExtractor.java | 21 ++++++++++++---------
1 file changed, 12 insertions(+), 9 deletions(-)
diff --git a/src/main/java/org/apache/sling/distribution/journal/impl/subscriber/ContentPackageExtractor.java b/src/main/java/org/apache/sling/distribution/journal/impl/subscriber/ContentPackageExtractor.java
index 44037ab..998f929 100644
--- a/src/main/java/org/apache/sling/distribution/journal/impl/subscriber/ContentPackageExtractor.java
+++ b/src/main/java/org/apache/sling/distribution/journal/impl/subscriber/ContentPackageExtractor.java
@@ -62,7 +62,7 @@ public class ContentPackageExtractor {
if (packageHandling == PackageHandling.Off) {
return;
}
- log.info("Scanning imported nodes for packages to install.");
+ log.debug("Scanning imported nodes for packages to install.");
for (String path : paths) {
try {
Resource resource = resourceResolver.getResource(path);
@@ -89,16 +89,19 @@ public class ContentPackageExtractor {
Session session = node.getSession();
JcrPackageManager packMgr = packageService.getPackageManager(session);
try (JcrPackage pack = packMgr.open(node)) {
- if (pack == null) {
- return;
- }
- ImportOptions opts = new ImportOptions();
- if (packageHandling == PackageHandling.Extract) {
- pack.extract(opts);
- } else {
- pack.install(opts);
+ if (pack != null) {
+ installPackage(pack);
}
}
}
+ private void installPackage(JcrPackage pack) throws RepositoryException, PackageException, IOException {
+ ImportOptions opts = new ImportOptions();
+ if (packageHandling == PackageHandling.Extract) {
+ pack.extract(opts);
+ } else {
+ pack.install(opts);
+ }
+ }
+
}