You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by tv...@apache.org on 2018/01/18 15:46:10 UTC
[15/50] tomee git commit: Refactoring / clean up
Refactoring / clean up
(cherry picked from commit 9797610e138bfd415500dafa33d7c2e120a5ff98)
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/79afc588
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/79afc588
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/79afc588
Branch: refs/heads/tomee-1.7.x
Commit: 79afc588f72d6519adbf2c81d25156881ab6543d
Parents: 2085f71
Author: Ivan Junckes Filho <iv...@gmail.com>
Authored: Fri Dec 15 11:39:32 2017 -0200
Committer: Thiago Veronezi <th...@veronezi.org>
Committed: Wed Jan 17 12:58:08 2018 -0500
----------------------------------------------------------------------
.../java/org/apache/openejb/core/instance/InstanceManager.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/79afc588/container/openejb-core/src/main/java/org/apache/openejb/core/instance/InstanceManager.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/core/instance/InstanceManager.java b/container/openejb-core/src/main/java/org/apache/openejb/core/instance/InstanceManager.java
index 84086b2..303b92e 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/core/instance/InstanceManager.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/core/instance/InstanceManager.java
@@ -141,7 +141,7 @@ public abstract class InstanceManager {
final ThreadContext ctx = new ThreadContext(beanContext, null);
final ThreadContext oldCallContext = ThreadContext.enter(ctx);
try {
- return createInstance(ctx, ctx.getBeanContext());
+ return createInstance(ctx.getBeanContext());
} catch (final OpenEJBException e) {
logger.error("Unable to fill pool: for deployment '" + beanContext.getDeploymentID() + "'", e);
} finally {
@@ -211,13 +211,13 @@ public abstract class InstanceManager {
}
if (null == instance) {
- instance = createInstance(callContext, beanContext);
+ instance = createInstance(beanContext);
}
return instance;
}
- private Instance createInstance(final ThreadContext callContext, final BeanContext beanContext) throws ApplicationException {
+ private Instance createInstance(final BeanContext beanContext) throws ApplicationException {
try {
final InstanceContext context = beanContext.newInstance();
return new Instance(context.getBean(), context.getInterceptors(), context.getCreationalContext());