[sling-org-apache-sling-servlets-resolver] branch master updated: SLING-9406 - Add bundled script support to the servlets resolver

[pauls]

This is an automated email from the ASF dual-hosted git repository.

pauls pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-servlets-resolver.git


The following commit(s) were added to refs/heads/master by this push:
     new e41a9fa  SLING-9406 - Add bundled script support to the servlets 
resolver
e41a9fa is described below

commit e41a9faae25982bdf2e6adb25b760bfdfaebb1c1
Author: Karl Pauls <karlpa...@gmail.com>
AuthorDate: Mon May 18 12:32:00 2020 +0200

    SLING-9406 - Add bundled script support to the servlets resolver
    
    * Fix a race condition
---
 .../resolver/internal/resource/MergingServletResourceProvider.java      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/src/main/java/org/apache/sling/servlets/resolver/internal/resource/MergingServletResourceProvider.java
 
b/src/main/java/org/apache/sling/servlets/resolver/internal/resource/MergingServletResourceProvider.java
index 1180fd7..9b3b364 100644
--- 
a/src/main/java/org/apache/sling/servlets/resolver/internal/resource/MergingServletResourceProvider.java
+++ 
b/src/main/java/org/apache/sling/servlets/resolver/internal/resource/MergingServletResourceProvider.java
@@ -147,7 +147,7 @@ public class MergingServletResourceProvider {
         Set<String> paths = tree.get(parent.getPath());
 
         if (paths != null) {
-            for (String path : paths) {
+            for (String path : paths.toArray(new String[0])) {
                 Pair<ServletResourceProvider, ServiceReference<?>> provider = 
providers.get(path);
 
                 if (provider != null) {