You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openwebbeans.apache.org by rm...@apache.org on 2014/09/08 21:02:27 UTC
svn commit: r1623461 - in /openwebbeans/trunk/webbeans-impl/src:
main/java/org/apache/webbeans/container/BeanManagerImpl.java
test/java/org/apache/webbeans/test/interceptors/lifecycle/InterceptorExtension.java
Author: rmannibucau
Date: Mon Sep 8 19:02:27 2014
New Revision: 1623461
URL: http://svn.apache.org/r1623461
Log:
beforeBeanDiscovery.addAnnotationType shouldn't not conflict with default key
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/BeanManagerImpl.java
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/interceptors/lifecycle/InterceptorExtension.java
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/BeanManagerImpl.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/BeanManagerImpl.java?rev=1623461&r1=1623460&r2=1623461&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/BeanManagerImpl.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/BeanManagerImpl.java Mon Sep 8 19:02:27 2014
@@ -1219,7 +1219,7 @@ public class BeanManagerImpl implements
public void addAdditionalAnnotatedType(Object extension, AnnotatedType<?> annotatedType)
{
- addAdditionalAnnotatedType(extension, annotatedType, AnnotatedElementFactory.OWB_DEFAULT_KEY);
+ addAdditionalAnnotatedType(extension, annotatedType, extension + AnnotatedElementFactory.OWB_DEFAULT_KEY);
}
public <T> void addAdditionalAnnotatedType(Object extension, AnnotatedType<T> inAnnotatedType, String id)
Modified: openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/interceptors/lifecycle/InterceptorExtension.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/interceptors/lifecycle/InterceptorExtension.java?rev=1623461&r1=1623460&r2=1623461&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/interceptors/lifecycle/InterceptorExtension.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/interceptors/lifecycle/InterceptorExtension.java Mon Sep 8 19:02:27 2014
@@ -23,7 +23,6 @@ import javax.enterprise.inject.spi.*;
import javax.enterprise.util.AnnotationLiteral;
import javax.interceptor.Interceptor;
-import org.apache.webbeans.config.WebBeansContext;
import org.apache.webbeans.util.ExceptionUtil;
import java.lang.annotation.Annotation;
@@ -58,10 +57,14 @@ public class InterceptorExtension implem
process.setAnnotatedType(process.getAnnotatedType());
}
+ public void vetoDefaultInterceptor(@Observes ProcessAnnotatedType<LifecycleInterceptorBbd> pat)
+ {
+ pat.veto();
+ }
+
// manually add the correct LifecycleInterceptorBbd
public void observeLiveCycleInterceptorBbd(@Observes BeforeBeanDiscovery bbd)
{
- WebBeansContext webBeansContext = WebBeansContext.getInstance();
AnnotatedTypeImpl<LifecycleInterceptorBbd> annotatedType =
new AnnotatedTypeImpl<LifecycleInterceptorBbd>(LifecycleInterceptorBbd.class );