You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rm...@apache.org on 2016/05/08 18:11:55 UTC

tomee git commit: TOMEE-1799 restoring existing ordering, impact resources in rare but existing cases. Making AppResources visibility consistent too (easier for tests and not less/more public)

Repository: tomee
Updated Branches:
  refs/heads/master 3a46ba5fd -> 4cf002b11


TOMEE-1799 restoring existing ordering, impact resources in rare but existing cases. Making AppResources visibility consistent too (easier for tests and not less/more public)


Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/4cf002b1
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/4cf002b1
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/4cf002b1

Branch: refs/heads/master
Commit: 4cf002b1133c68e7fadbfcc1e37c5ddbd7bfc412
Parents: 3a46ba5
Author: Romain manni-Bucau <rm...@gmail.com>
Authored: Sun May 8 20:11:33 2016 +0200
Committer: Romain manni-Bucau <rm...@gmail.com>
Committed: Sun May 8 20:11:33 2016 +0200

----------------------------------------------------------------------
 .../src/main/java/org/apache/openejb/config/AutoConfig.java  | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tomee/blob/4cf002b1/container/openejb-core/src/main/java/org/apache/openejb/config/AutoConfig.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/config/AutoConfig.java b/container/openejb-core/src/main/java/org/apache/openejb/config/AutoConfig.java
index 9c40293..71b0b9c 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/config/AutoConfig.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/config/AutoConfig.java
@@ -2063,9 +2063,9 @@ public class AutoConfig implements DynamicDeployer, JndiConstants {
                     return -1;
                 } else if (o2.startsWith(prefix)) {
                     return 1;
-                } else {
-                    return resourceIds.indexOf(o2) - resourceIds.indexOf(o1);
                 }
+                // make it stable with prefixed comparison + keep existing ordering (bck compat)
+                return resourceIds.indexOf(o1) - resourceIds.indexOf(o2);
             }
         });
         String idd = null;
@@ -2270,7 +2270,7 @@ public class AutoConfig implements DynamicDeployer, JndiConstants {
         return null;
     }
 
-    static class AppResources {
+    /*private*/ static class AppResources {
 
         private String appId;
 
@@ -2308,7 +2308,7 @@ public class AutoConfig implements DynamicDeployer, JndiConstants {
         public AppResources() {
         }
 
-        protected AppResources(final AppModule appModule) {
+        public AppResources(final AppModule appModule) {
 
             this.appId = appModule.getModuleId();