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 2013/02/17 23:55:24 UTC
svn commit: r1447097 -
/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/AutoConfig.java
Author: rmannibucau
Date: Sun Feb 17 22:55:24 2013
New Revision: 1447097
URL: http://svn.apache.org/r1447097
Log:
correct sorting of resources + copying it for firstmatching to avoid side effect between apps
Modified:
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/AutoConfig.java
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/AutoConfig.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/AutoConfig.java?rev=1447097&r1=1447096&r2=1447097&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/AutoConfig.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/AutoConfig.java Sun Feb 17 22:55:24 2013
@@ -1826,18 +1826,18 @@ public class AutoConfig implements Dynam
}
private String firstMatching(final String prefix, String type, Properties required, AppResources appResources) {
- List<String> resourceIds = getResourceIds(appResources, type, required);
+ List<String> resourceIds = new ArrayList<String>(getResourceIds(appResources, type, required));
Collections.sort(resourceIds, new Comparator<String>() { // sort from webapp to global resources
@Override
public int compare(String o1, String o2) { // don't change global order, just put app scoped resource before others
if (o1.startsWith(prefix) && o2.startsWith(prefix)) {
- return 1;
+ return -1;
} else if (o1.startsWith(prefix)) {
- return 1;
- } else if (o2.startsWith(prefix)) {
return -1;
+ } else if (o2.startsWith(prefix)) {
+ return 1;
}
- return 1;
+ return -1;
}
});
String idd = null;