You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by st...@apache.org on 2015/03/11 12:56:54 UTC
[38/50] tomee git commit: oops resolveInterceptors need something and
doesnt support empty set
oops resolveInterceptors need something and doesnt support empty set
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/927c3cab
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/927c3cab
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/927c3cab
Branch: refs/heads/master
Commit: 927c3cabe610196cdd1784543c76888d190d5e32
Parents: 3e40a2f
Author: Romain Manni-Bucau <rm...@apache.org>
Authored: Fri Mar 6 18:19:49 2015 +0100
Committer: Romain Manni-Bucau <rm...@apache.org>
Committed: Fri Mar 6 18:19:49 2015 +0100
----------------------------------------------------------------------
.../src/main/java/org/apache/openejb/BeanContext.java | 14 ++++++++------
tck/cdi-embedded/src/test/resources/failing.xml | 2 +-
2 files changed, 9 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/927c3cab/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 1535f5e..45582e3 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
@@ -206,13 +206,15 @@ public class BeanContext extends DeploymentContext {
break;
}
}
- for (final Interceptor<?> timeoutInterceptor : getWebBeansContext().getBeanManagerImpl()
- .resolveInterceptors(InterceptionType.AROUND_TIMEOUT, AnnotationUtil.asArray(annotations))) {
- if (isEjbInterceptor(timeoutInterceptor)) {
- continue;
+ if (!annotations.isEmpty()) {
+ for (final Interceptor<?> timeoutInterceptor : getWebBeansContext().getBeanManagerImpl()
+ .resolveInterceptors(InterceptionType.AROUND_TIMEOUT, AnnotationUtil.asArray(annotations))) {
+ if (isEjbInterceptor(timeoutInterceptor)) {
+ continue;
+ }
+ final InterceptorData data = createInterceptorData(timeoutInterceptor);
+ addCdiMethodInterceptor(timeout, data);
}
- final InterceptorData data = createInterceptorData(timeoutInterceptor);
- addCdiMethodInterceptor(timeout, data);
}
}
}
http://git-wip-us.apache.org/repos/asf/tomee/blob/927c3cab/tck/cdi-embedded/src/test/resources/failing.xml
----------------------------------------------------------------------
diff --git a/tck/cdi-embedded/src/test/resources/failing.xml b/tck/cdi-embedded/src/test/resources/failing.xml
index 29c6d9b..e32235d 100644
--- a/tck/cdi-embedded/src/test/resources/failing.xml
+++ b/tck/cdi-embedded/src/test/resources/failing.xml
@@ -31,7 +31,7 @@
-Dopenejb.embedded.try-jsp=true
-->
<classes>
- <class name="org.jboss.cdi.tck.interceptors.tests.contract.aroundTimeout.bindings.AroundTimeoutOrderInterceptorTest" />
+ <class name="org.jboss.cdi.tck.tests.context.application.ejb.ApplicationContextSharedTest" />
</classes>
</test>
</suite>