Repository: tomee Updated Branches: refs/heads/develop 9eebf3687 -> 10406df27
avoid NPE Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/10406df2 Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/10406df2 Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/10406df2 Branch: refs/heads/develop Commit: 10406df27163b305a2577b2c844b0c5d6dccecf4 Parents: ee3786c Author: Romain Manni-Bucau <[email protected]> Authored: Thu Mar 5 20:42:27 2015 +0100 Committer: Romain Manni-Bucau <[email protected]> Committed: Thu Mar 5 20:42:41 2015 +0100 ---------------------------------------------------------------------- .../java/org/apache/openejb/BeanContext.java | 36 +++++++++++--------- 1 file changed, 20 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/10406df2/container/openejb-core/src/main/java/org/apache/openejb/BeanContext.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/main/java/org/apache/openejb/BeanContext.java b/container/openejb-core/src/main/java/org/apache/openejb/BeanContext.java index 1270cd7..d21b20f 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/BeanContext.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/BeanContext.java @@ -127,25 +127,29 @@ public class BeanContext extends DeploymentContext { final Collection<Interceptor<?>> postConstructInterceptors = Collection.class.cast(Reflections.get(injectionTarget, "postConstructInterceptors")); final Collection<Interceptor<?>> preDestroyInterceptors = Collection.class.cast(Reflections.get(injectionTarget, "preDestroyInterceptors")); - for (final Interceptor<?> pc : postConstructInterceptors) { - if (isEjbInterceptor(pc)) { - continue; - } + if (postConstructInterceptors != null) { + for (final Interceptor<?> pc : postConstructInterceptors) { + if (isEjbInterceptor(pc)) { + continue; + } - final InterceptorData interceptorData = createInterceptorData(pc); - instanceScopedInterceptors.add(interceptorData); - cdiInterceptors.add(interceptorData); - } - for (final Interceptor<?> pd : preDestroyInterceptors) { - if (isEjbInterceptor(pd)) { - continue; + final InterceptorData interceptorData = createInterceptorData(pc); + instanceScopedInterceptors.add(interceptorData); + cdiInterceptors.add(interceptorData); } - if (postConstructInterceptors.contains(pd)) { - continue; + } + if (preDestroyInterceptors != null) { + for (final Interceptor<?> pd : preDestroyInterceptors) { + if (isEjbInterceptor(pd)) { + continue; + } + if (postConstructInterceptors.contains(pd)) { + continue; + } + final InterceptorData interceptorData = createInterceptorData(pd); + instanceScopedInterceptors.add(interceptorData); + cdiInterceptors.add(interceptorData); } - final InterceptorData interceptorData = createInterceptorData(pd); - instanceScopedInterceptors.add(interceptorData); - cdiInterceptors.add(interceptorData); } for (final Map.Entry<Method, InterceptorResolutionService.BusinessMethodInterceptorInfo> entry : info.getBusinessMethodsInfo().entrySet()) {
