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/07/03 04:47:46 UTC
tomee git commit: dont post construct proxies - xbean would fail on
them anyway
Repository: tomee
Updated Branches:
refs/heads/master e71bad134 -> 0a03b0c45
dont post construct proxies - xbean would fail on them anyway
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/0a03b0c4
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/0a03b0c4
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/0a03b0c4
Branch: refs/heads/master
Commit: 0a03b0c45a4664a68d709c486a2ef22530d14828
Parents: e71bad1
Author: Romain Manni-Bucau <rm...@apache.org>
Authored: Fri Jul 3 04:47:34 2015 +0200
Committer: Romain Manni-Bucau <rm...@apache.org>
Committed: Fri Jul 3 04:47:34 2015 +0200
----------------------------------------------------------------------
.../org/apache/openejb/assembler/classic/Assembler.java | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/0a03b0c4/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 3b79535..118f2b7 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
@@ -1162,10 +1162,13 @@ public class Assembler extends AssemblerTool implements org.apache.openejb.spi.A
clazz = containerSystemContext.lookup(OPENEJB_RESOURCE_JNDI_PREFIX + resourceInfo.id).getClass();
}
- final AnnotationFinder finder = new AnnotationFinder(new ClassesArchive(ancestors(clazz)));
- final List<Method> postConstructs = finder.findAnnotatedMethods(PostConstruct.class);
- final List<Method> preDestroys = finder.findAnnotatedMethods(PreDestroy.class);
final boolean initialize = "true".equalsIgnoreCase(String.valueOf(resourceInfo.properties.remove("InitializeAfterDeployment")));
+ final AnnotationFinder finder = Proxy.isProxyClass(clazz) ?
+ null : new AnnotationFinder(new ClassesArchive(ancestors(clazz)));
+ final List<Method> postConstructs = finder == null ?
+ Collections.<Method>emptyList() : finder.findAnnotatedMethods(PostConstruct.class);
+ final List<Method> preDestroys = finder == null ?
+ Collections.<Method>emptyList() : finder.findAnnotatedMethods(PreDestroy.class);
CreationalContext<?> creationalContext = null;
Object originalResource = null;