SLING-9015 - fix null/empty checks and activate corresponding test
diff --git a/src/main/java/org/apache/sling/jcr/repoinit/impl/RepositoryInitializerFactory.java b/src/main/java/org/apache/sling/jcr/repoinit/impl/RepositoryInitializerFactory.java
index b82f00c..3eae372 100644
--- a/src/main/java/org/apache/sling/jcr/repoinit/impl/RepositoryInitializerFactory.java
+++ b/src/main/java/org/apache/sling/jcr/repoinit/impl/RepositoryInitializerFactory.java
@@ -106,6 +106,9 @@
if ( config.references() != null ) {
final RepoinitTextProvider p = new RepoinitTextProvider();
for(final String reference : config.references()) {
+ if(reference == null || reference.trim().length() == 0) {
+ continue;
+ }
final String repoinitText = p.getRepoinitText("raw:" + reference);
final List<Operation> ops = parser.parse(new StringReader(repoinitText));
log.info("Executing {} repoinit operations", ops.size());
@@ -115,6 +118,9 @@
}
if ( config.scripts() != null ) {
for(final String script : config.scripts()) {
+ if(script == null || script.trim().length() == 0) {
+ continue;
+ }
final List<Operation> ops = parser.parse(new StringReader(script));
log.info("Executing {} repoinit operations", ops.size());
processor.apply(s, ops);
diff --git a/src/test/java/org/apache/sling/jcr/repoinit/it/RepositoryInitializerFactoryIT.java b/src/test/java/org/apache/sling/jcr/repoinit/it/RepositoryInitializerFactoryIT.java
index e3e5c86..36c00b5 100644
--- a/src/test/java/org/apache/sling/jcr/repoinit/it/RepositoryInitializerFactoryIT.java
+++ b/src/test/java/org/apache/sling/jcr/repoinit/it/RepositoryInitializerFactoryIT.java
@@ -87,12 +87,10 @@
"create path /repoinit-test/scripts/A",
"/repoinit-test/scripts/A");
- /* Fails due to SLING-9015
assertConfigAndPaths(
"",
"create path /repoinit-test/scripts/B",
"/repoinit-test/scripts/B");
- */
assertConfigAndPaths(
getTestFileUrl("/repoinit-path-3.txt"),
