You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by to...@apache.org on 2016/07/28 10:23:49 UTC
svn commit: r1754387 -
/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/importer/LocalDistributionPackageImporter.java
Author: tommaso
Date: Thu Jul 28 10:23:49 2016
New Revision: 1754387
URL: http://svn.apache.org/viewvc?rev=1754387&view=rev
Log:
SLING-5695 - fixed local importer
Modified:
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/importer/LocalDistributionPackageImporter.java
Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/importer/LocalDistributionPackageImporter.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/importer/LocalDistributionPackageImporter.java?rev=1754387&r1=1754386&r2=1754387&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/importer/LocalDistributionPackageImporter.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/importer/LocalDistributionPackageImporter.java Thu Jul 28 10:23:49 2016
@@ -102,10 +102,14 @@ public class LocalDistributionPackageImp
log.info("installing from reference {}", actualPackageId);
DistributionPackage distributionPackage = packageBuilder.getPackage(resourceResolver, actualPackageId);
if (distributionPackage != null) {
- DistributionPackageInfo packageInfo = packageBuilder.installPackage(resourceResolver, stream);
- log.info("package installed {}", packageInfo);
- eventFactory.generatePackageEvent(DistributionEventTopics.IMPORTER_PACKAGE_IMPORTED, DistributionComponentKind.IMPORTER, name, packageInfo);
- return distributionPackage.getInfo();
+ if (packageBuilder.installPackage(resourceResolver, distributionPackage)) {
+ DistributionPackageInfo info = distributionPackage.getInfo();
+ log.info("package installed {}", info);
+ eventFactory.generatePackageEvent(DistributionEventTopics.IMPORTER_PACKAGE_IMPORTED, DistributionComponentKind.IMPORTER, name, info);
+ return info;
+ } else {
+ throw new DistributionException("could not install package {}" + distributionPackage);
+ }
} else {
throw new DistributionException("could not install package from reference " + actualPackageId);
}