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 0e4550f SLING-7134 - Script execution order is not deterministic on
Java 9
0e4550f is described below
commit 0e4550fed207e34cf4bf55f23a764ebc5ecee6d1
Author: Karl Pauls <[email protected]>
AuthorDate: Tue Dec 5 22:09:22 2017 +0100
SLING-7134 - Script execution order is not deterministic on Java 9
---
.../resolver/internal/helper/AbstractResourceCollector.java | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git
a/src/main/java/org/apache/sling/servlets/resolver/internal/helper/AbstractResourceCollector.java
b/src/main/java/org/apache/sling/servlets/resolver/internal/helper/AbstractResourceCollector.java
index 10d2cad..4064743 100644
---
a/src/main/java/org/apache/sling/servlets/resolver/internal/helper/AbstractResourceCollector.java
+++
b/src/main/java/org/apache/sling/servlets/resolver/internal/helper/AbstractResourceCollector.java
@@ -80,12 +80,14 @@ public abstract class AbstractResourceCollector {
if (StringUtils.isNotEmpty(o1Extension) &&
StringUtils.isNotEmpty(o2Extension)) {
int o1ExtensionIndex =
scriptExtensions.indexOf(o1Extension);
int o2ExtensionIndex =
scriptExtensions.indexOf(o2Extension);
- if (o1ExtensionIndex > o2ExtensionIndex) {
- return -1;
- } else if (o1ExtensionIndex == o2ExtensionIndex) {
+
+ if (o1ExtensionIndex == o2ExtensionIndex ||
o1ExtensionIndex == -1 || o2ExtensionIndex == -1) {
return o1.compareTo(o2);
+ } else if (o1ExtensionIndex > o2ExtensionIndex) {
+ return -1;
+ } else {
+ return 1;
}
- return 1;
}
return o1.compareTo(o2);
}
--
To stop receiving notification emails like this one, please contact
['"[email protected]" <[email protected]>'].
