You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by jg...@apache.org on 2015/04/23 11:48:42 UTC
tomee git commit: PMD
Repository: tomee
Updated Branches:
refs/heads/tomee-1.7.x 558760138 -> 9ecb6a981
PMD
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/9ecb6a98
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/9ecb6a98
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/9ecb6a98
Branch: refs/heads/tomee-1.7.x
Commit: 9ecb6a981e83d57d3f6a6bcf8334a49da26e2e25
Parents: 5587601
Author: Jonathan Gallimore <jo...@jrg.me.uk>
Authored: Thu Apr 23 10:32:13 2015 +0100
Committer: Jonathan Gallimore <jo...@jrg.me.uk>
Committed: Thu Apr 23 10:32:13 2015 +0100
----------------------------------------------------------------------
.../java/org/apache/openejb/assembler/classic/Assembler.java | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/9ecb6a98/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java b/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
index 4b966f8..d7b4941 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
@@ -517,11 +517,10 @@ public class Assembler extends AssemblerTool implements org.apache.openejb.spi.A
createSecurityService(configInfo.facilities.securityService);
- final Set<String> rIds = new HashSet<String>(configInfo.facilities.resources.size());
for (final ResourceInfo resourceInfo : configInfo.facilities.resources) {
createResource(resourceInfo);
}
- postConstructResources(rIds, ParentClassLoaderFinder.Helper.get(), systemInstance.getComponent(ContainerSystem.class).getJNDIContext(), null);
+ postConstructResources(ParentClassLoaderFinder.Helper.get(), systemInstance.getComponent(ContainerSystem.class).getJNDIContext(), null);
// Containers
for (final ContainerInfo serviceInfo : containerSystemInfo.containers) {
@@ -943,7 +942,7 @@ public class Assembler extends AssemblerTool implements org.apache.openejb.spi.A
}
}
- postConstructResources(appInfo.resourceIds, classLoader, containerSystemContext, appContext);
+ postConstructResources(classLoader, containerSystemContext, appContext);
deployedApplications.put(appInfo.path, appInfo);
resumePersistentSchedulers(appContext);
@@ -964,7 +963,7 @@ public class Assembler extends AssemblerTool implements org.apache.openejb.spi.A
}
}
- private void postConstructResources(final Set<String> inResourceIds, final ClassLoader classLoader, final Context containerSystemContext, final AppContext appContext) throws NamingException, OpenEJBException {
+ private void postConstructResources(final ClassLoader classLoader, final Context containerSystemContext, final AppContext appContext) throws NamingException, OpenEJBException {
final Thread thread = Thread.currentThread();
final ClassLoader oldCl = thread.getContextClassLoader();