tomee-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jgallim...@apache.org
Subject [4/5] tomee git commit: using the intended instance of the sorted list
Date Wed, 27 May 2015 13:48:52 GMT
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/db43535f
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/db43535f
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/db43535f

Branch: refs/heads/tomee-1.7.x
Commit: db43535fa83fab2346e4e6e0e22ab80eee9eb6c1
Parents: 507e56e
Author: Romain Manni-Bucau <rmannibucau@apache.org>
Authored: Wed May 27 08:47:46 2015 +0200
Committer: Jonathan Gallimore <jon@jrg.me.uk>
Committed: Wed May 27 14:02:48 2015 +0100

----------------------------------------------------------------------
 .../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/db43535f/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 1dcd1f8..c525b80 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
@@ -878,7 +878,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());
@@ -952,7 +952,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/db43535f/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 5282276..b9d75f8 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
@@ -481,12 +481,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);
 


Mime
View raw message