You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by pa...@apache.org on 2017/12/05 12:49:13 UTC
[sling-org-apache-sling-servlets-resolver] branch master updated
(22a6a92 -> 1d7a800)
This is an automated email from the ASF dual-hosted git repository.
pauls pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-servlets-resolver.git.
from 22a6a92 SLING-7265 : NPE on activation of SlingServletResolver
add 600cccb SLING-7134 - Script execution order is not deterministic on Java 9
new 1d7a800 Merge pull request #1 from apache/issue/SLING-7134
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../resolver/internal/SlingServletResolver.java | 21 ++++++++-
.../internal/helper/AbstractResourceCollector.java | 50 +++++++++++++++++++---
.../helper/NamedScriptResourceCollector.java | 2 +-
.../internal/helper/ResourceCollector.java | 6 +--
.../resolver/internal/helper/WeightedResource.java | 3 +-
.../internal/SlingServletResolverTest.java | 6 +++
.../internal/helper/ResourceCollectorTest.java | 44 ++++++++++++++++++-
.../internal/helper/ScriptSelectionTest.java | 3 +-
.../internal/helper/WeightedResourceTest.java | 11 -----
9 files changed, 120 insertions(+), 26 deletions(-)
--
To stop receiving notification emails like this one, please contact
['"commits@sling.apache.org" <co...@sling.apache.org>'].
[sling-org-apache-sling-servlets-resolver] 01/01: Merge pull
request #1 from apache/issue/SLING-7134
Posted by pa...@apache.org.
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
commit 1d7a8008a778547613a1c0bf0f743ab248626334
Merge: 22a6a92 600cccb
Author: Karl Pauls <pa...@apache.org>
AuthorDate: Tue Dec 5 13:49:12 2017 +0100
Merge pull request #1 from apache/issue/SLING-7134
SLING-7134 - Script execution order is not deterministic on Java 9
.../resolver/internal/SlingServletResolver.java | 21 ++++++++-
.../internal/helper/AbstractResourceCollector.java | 50 +++++++++++++++++++---
.../helper/NamedScriptResourceCollector.java | 2 +-
.../internal/helper/ResourceCollector.java | 6 +--
.../resolver/internal/helper/WeightedResource.java | 3 +-
.../internal/SlingServletResolverTest.java | 6 +++
.../internal/helper/ResourceCollectorTest.java | 44 ++++++++++++++++++-
.../internal/helper/ScriptSelectionTest.java | 3 +-
.../internal/helper/WeightedResourceTest.java | 11 -----
9 files changed, 120 insertions(+), 26 deletions(-)
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.