Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansUtil.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansUtil.java?rev=1465432&r1=1465431&r2=1465432&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansUtil.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansUtil.java Sun Apr 7 17:26:47 2013 @@ -1401,30 +1401,30 @@ public final class WebBeansUtil } } - public static boolean isExtensionEventType(Class<?> clazz) + public static boolean isExtensionEventType(Type type) { - return clazz.equals(BeforeBeanDiscovery.class) || - clazz.equals(AfterBeanDiscovery.class) || - clazz.equals(AfterDeploymentValidation.class) || - clazz.equals(BeforeShutdown.class) || - clazz.equals(GProcessAnnotatedType.class) || - clazz.equals(GProcessInjectionTarget.class) || - clazz.equals(GProcessProducer.class) || - clazz.equals(GProcessProducerField.class) || - clazz.equals(GProcessProducerMethod.class) || - clazz.equals(GProcessManagedBean.class) || - clazz.equals(GProcessBean.class) || - clazz.equals(GProcessSessionBean.class) || - clazz.equals(GProcessObservableMethod.class); - } - - public static boolean isExtensionBeanEventType(Class<?> clazz) - { - return clazz.equals(GProcessAnnotatedType.class) || - clazz.equals(GProcessInjectionTarget.class) || - clazz.equals(GProcessManagedBean.class) || - clazz.equals(GProcessSessionBean.class) || - clazz.equals(GProcessBean.class); + return type.equals(BeforeBeanDiscovery.class) || + type.equals(AfterBeanDiscovery.class) || + type.equals(AfterDeploymentValidation.class) || + type.equals(BeforeShutdown.class) || + type.equals(GProcessAnnotatedType.class) || + type.equals(GProcessInjectionTarget.class) || + type.equals(GProcessProducer.class) || + type.equals(GProcessProducerField.class) || + type.equals(GProcessProducerMethod.class) || + type.equals(GProcessManagedBean.class) || + type.equals(GProcessBean.class) || + type.equals(GProcessSessionBean.class) || + type.equals(GProcessObservableMethod.class); + } + + public static boolean isExtensionBeanEventType(Type type) + { + return type.equals(GProcessAnnotatedType.class) || + type.equals(GProcessInjectionTarget.class) || + type.equals(GProcessManagedBean.class) || + type.equals(GProcessSessionBean.class) || + type.equals(GProcessBean.class); } public static boolean isDefaultExtensionBeanEventType(Class<?> clazz) @@ -1436,12 +1436,12 @@ public final class WebBeansUtil clazz.equals(ProcessSessionBean.class); } - public static boolean isExtensionProducerOrObserverEventType(Class<?> clazz) + public static boolean isExtensionProducerOrObserverEventType(Type type) { - return clazz.equals(GProcessProducer.class) || - clazz.equals(GProcessProducerField.class) || - clazz.equals(GProcessProducerMethod.class) || - clazz.equals(GProcessObservableMethod.class); + return type.equals(GProcessProducer.class) || + type.equals(GProcessProducerField.class) || + type.equals(GProcessProducerMethod.class) || + type.equals(GProcessObservableMethod.class); } public static boolean isDefaultExtensionProducerOrObserverEventType(Class<?> clazz)
Modified: openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/injection/injectionpoint/tests/DependentProducerMethodInjectionPointTest.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/injection/injectionpoint/tests/DependentProducerMethodInjectionPointTest.java?rev=1465432&r1=1465431&r2=1465432&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/injection/injectionpoint/tests/DependentProducerMethodInjectionPointTest.java (original) +++ openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/injection/injectionpoint/tests/DependentProducerMethodInjectionPointTest.java Sun Apr 7 17:26:47 2013 @@ -61,7 +61,7 @@ public class DependentProducerMethodInje InjectionPointMetaDataOwner model2 = (InjectionPointMetaDataOwner) getBeanManager().getReference(bean2, InjectionPointMetaDataOwner.class, cc2); InjectionPoint point = model2.getInjectionPoint(); - Assert.assertTrue(point.getBean().equals(bean)); + Assert.assertEquals(bean, point.getBean()); Assert.assertTrue(point.getMember() instanceof Field); point = (InjectionPoint) deserialize(serialize(point)); Modified: openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/servlet/WebBeansConfigurationFilter.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/servlet/WebBeansConfigurationFilter.java?rev=1465432&r1=1465431&r2=1465432&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/servlet/WebBeansConfigurationFilter.java (original) +++ openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/servlet/WebBeansConfigurationFilter.java Sun Apr 7 17:26:47 2013 @@ -23,7 +23,6 @@ import org.apache.webbeans.config.OWBLog import org.apache.webbeans.config.WebBeansContext; import org.apache.webbeans.el.ELContextStore; import org.apache.webbeans.logger.WebBeansLoggerFacade; -import org.apache.webbeans.portable.InjectionPointProducer; import org.apache.webbeans.spi.ContainerLifecycle; import org.apache.webbeans.spi.FailOverService; import org.apache.webbeans.util.WebBeansUtil; @@ -223,8 +222,6 @@ public class WebBeansConfigurationFilter private void cleanupRequestThreadLocals() { // TODO maybe there are more to cleanup - - InjectionPointProducer.removeThreadLocal(); WebContextsService.removeThreadLocals(); } } Modified: openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/servlet/WebBeansConfigurationListener.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/servlet/WebBeansConfigurationListener.java?rev=1465432&r1=1465431&r2=1465432&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/servlet/WebBeansConfigurationListener.java (original) +++ openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/servlet/WebBeansConfigurationListener.java Sun Apr 7 17:26:47 2013 @@ -23,7 +23,6 @@ import org.apache.webbeans.config.WebBea import org.apache.webbeans.conversation.ConversationManager; import org.apache.webbeans.el.ELContextStore; import org.apache.webbeans.logger.WebBeansLoggerFacade; -import org.apache.webbeans.portable.InjectionPointProducer; import org.apache.webbeans.spi.ContainerLifecycle; import org.apache.webbeans.spi.FailOverService; import org.apache.webbeans.util.WebBeansUtil; @@ -135,7 +134,6 @@ public class WebBeansConfigurationListen */ private void cleanupRequestThreadLocals() { - InjectionPointProducer.removeThreadLocal(); WebContextsService.removeThreadLocals(); } Modified: openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/lifecycle/WebContainerLifecycle.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/lifecycle/WebContainerLifecycle.java?rev=1465432&r1=1465431&r2=1465432&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/lifecycle/WebContainerLifecycle.java (original) +++ openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/lifecycle/WebContainerLifecycle.java Sun Apr 7 17:26:47 2013 @@ -24,7 +24,6 @@ import org.apache.webbeans.config.WebBea import org.apache.webbeans.exception.WebBeansException; import org.apache.webbeans.lifecycle.AbstractLifeCycle; import org.apache.webbeans.logger.WebBeansLoggerFacade; -import org.apache.webbeans.portable.InjectionPointProducer; import org.apache.webbeans.spi.ResourceInjectionService; import org.apache.webbeans.spi.adaptor.ELAdaptor; import org.apache.webbeans.web.context.WebContextsService; @@ -202,7 +201,6 @@ public final class WebContainerLifecycle */ private void cleanupShutdownThreadLocals() { - InjectionPointProducer.removeThreadLocal(); WebContextsService.removeThreadLocals(); }
