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 2015/05/27 08:47:53 UTC
tomee git commit: using the intended instance of the sorted list
Repository: tomee
Updated Branches:
refs/heads/master fbe6e6c6e -> d2fdd7632
using the intended instance of the sorted list
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/d2fdd763
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/d2fdd763
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/d2fdd763
Branch: refs/heads/master
Commit: d2fdd76324465450184f3e125371b45c3cf24760
Parents: fbe6e6c
Author: Romain Manni-Bucau <rm...@apache.org>
Authored: Wed May 27 08:47:46 2015 +0200
Committer: Romain Manni-Bucau <rm...@apache.org>
Committed: Wed May 27 08:47:46 2015 +0200
----------------------------------------------------------------------
.../src/main/java/org/apache/openejb/config/AutoConfig.java | 4 ++--
.../java/org/apache/openejb/config/ConfigurationFactory.java | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/d2fdd763/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 f828b4c..2f75f84 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
@@ -934,7 +934,7 @@ public class AutoConfig implements DynamicDeployer, JndiConstants {
Collections.addAll(jndiConsumers, ejbModule.getEjbJar().getEnterpriseBeans());
}
- final List<ResourceInfo> resourceInfos = new ArrayList<ResourceInfo>();
+ List<ResourceInfo> resourceInfos = new ArrayList<ResourceInfo>();
final Map<ResourceInfo, Resource> resourcesMap = new HashMap<ResourceInfo, Resource>(resources.size());
for (final Resource resource : resources) {
final String originalId = PropertyPlaceHolderHelper.value(resource.getId());
@@ -1008,7 +1008,7 @@ public class AutoConfig implements DynamicDeployer, JndiConstants {
resourcesMap.put(resourceInfo, resource);
}
- ConfigurationFactory.sort(resourceInfos, module.getModuleId() + "/");
+ resourceInfos = ConfigurationFactory.sort(resourceInfos, module.getModuleId() + "/");
for (final ResourceInfo resourceInfo : resourceInfos) {
final int originalSize = resourceInfo.aliases.size();
final String id = installResource(module.getModuleId(), resourceInfo);
http://git-wip-us.apache.org/repos/asf/tomee/blob/d2fdd763/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java b/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java
index f78f86a..7f21b73 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java
@@ -496,12 +496,12 @@ public class ConfigurationFactory implements OpenEjbConfigurationFactory {
sys.facilities.transactionService = configureService(openejb.getTransactionManager(), TransactionServiceInfo.class);
- final List<ResourceInfo> resources = new ArrayList<ResourceInfo>();
+ List<ResourceInfo> resources = new ArrayList<>();
for (final Resource resource : openejb.getResource()) {
final ResourceInfo resourceInfo = configureService(resource, ResourceInfo.class);
resources.add(resourceInfo);
}
- sort(resources, null);
+ resources = sort(resources, null);
sys.facilities.resources.addAll(resources);