| commit | dd2685bfe7d690e6514e9073c00221151ffa3cc7 | [log] [tgz] |
|---|---|---|
| author | Dr. Hans-Peter Störr <yu4cheem@techno.ms> | Thu Apr 29 10:01:42 2021 +0200 |
| committer | GitHub <noreply@github.com> | Thu Apr 29 10:01:42 2021 +0200 |
| tree | dce62a60211ce6a8940889b28f340bbaf3ba0fa7 | |
| parent | 9a8d76c3ae1e6aa706415667b0e7dff90c4a18c6 [diff] |
SLING-10339 temporarily explicitly initialize FSPackageRegistry since contains() yields false until initialized (#7)
diff --git a/src/main/java/org/apache/sling/jcr/packageinit/impl/ExecutionPlanRepoInitializer.java b/src/main/java/org/apache/sling/jcr/packageinit/impl/ExecutionPlanRepoInitializer.java index 3bc93cb..eb18235 100644 --- a/src/main/java/org/apache/sling/jcr/packageinit/impl/ExecutionPlanRepoInitializer.java +++ b/src/main/java/org/apache/sling/jcr/packageinit/impl/ExecutionPlanRepoInitializer.java
@@ -132,6 +132,9 @@ logger.info("Waiting for PackageRegistry."); PackageRegistry registry = (PackageRegistry) st.waitForService(0); logger.info("PackageRegistry found - starting execution of execution plan"); + // workaround until https://issues.apache.org/jira/browse/JCRVLT-517 is solved: registry.contains yields false value until initialized, + // making the call ExecutionPlan.execute() later fail if a new package has a dependency on another package declared + registry.packages(); ExecutionPlanBuilder builder = registry.createExecutionPlan(); @SuppressWarnings("deprecation")
diff --git a/src/test/java/org/apache/sling/jcr/packageinit/ExecutionPlanRepoInitializerTest.java b/src/test/java/org/apache/sling/jcr/packageinit/ExecutionPlanRepoInitializerTest.java index 36aa215..45da686 100644 --- a/src/test/java/org/apache/sling/jcr/packageinit/ExecutionPlanRepoInitializerTest.java +++ b/src/test/java/org/apache/sling/jcr/packageinit/ExecutionPlanRepoInitializerTest.java
@@ -105,8 +105,8 @@ @Mock Session adminSession; - @Spy - PackageRegistry registry = new FSPackageRegistry(); + @Mock + PackageRegistry registry; @Mock ExecutionPlanBuilder builder;