Return-Path: X-Original-To: apmail-openwebbeans-commits-archive@www.apache.org Delivered-To: apmail-openwebbeans-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 0E5CA101CA for ; Thu, 18 Jul 2013 06:50:34 +0000 (UTC) Received: (qmail 39502 invoked by uid 500); 18 Jul 2013 06:50:34 -0000 Delivered-To: apmail-openwebbeans-commits-archive@openwebbeans.apache.org Received: (qmail 39447 invoked by uid 500); 18 Jul 2013 06:50:29 -0000 Mailing-List: contact commits-help@openwebbeans.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@openwebbeans.apache.org Delivered-To: mailing list commits@openwebbeans.apache.org Received: (qmail 36868 invoked by uid 99); 18 Jul 2013 06:50:25 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 18 Jul 2013 06:50:25 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 18 Jul 2013 06:50:24 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 669DD238890D; Thu, 18 Jul 2013 06:50:04 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1504374 - in /openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans: component/creation/ProducerMethodBeansBuilder.java util/WebBeansUtil.java Date: Thu, 18 Jul 2013 06:50:04 -0000 To: commits@openwebbeans.apache.org From: rmannibucau@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20130718065004.669DD238890D@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: rmannibucau Date: Thu Jul 18 06:50:03 2013 New Revision: 1504374 URL: http://svn.apache.org/r1504374 Log: OWB-885 better ejb handling in ProducerMethodBeansBuilder + slight clean up of jb handling in WebBeansUtil for specialization Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ProducerMethodBeansBuilder.java openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansUtil.java Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ProducerMethodBeansBuilder.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ProducerMethodBeansBuilder.java?rev=1504374&r1=1504373&r2=1504374&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ProducerMethodBeansBuilder.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ProducerMethodBeansBuilder.java Thu Jul 18 06:50:03 2013 @@ -19,7 +19,6 @@ package org.apache.webbeans.component.creation; import org.apache.webbeans.component.BeanAttributesImpl; -import org.apache.webbeans.component.EnterpriseBeanMarker; import org.apache.webbeans.component.InjectionTargetBean; import org.apache.webbeans.component.ProducerMethodBean; import org.apache.webbeans.config.WebBeansContext; @@ -75,10 +74,8 @@ public class ProducerMethodBeansBuilder< for(AnnotatedMethod annotatedMethod: annotatedMethods) { - boolean enterprise = EnterpriseBeanMarker.class.isInstance(bean); if(annotatedMethod.isAnnotationPresent(Produces.class) && - (annotatedMethod.getJavaMember().getDeclaringClass().equals(annotatedType.getJavaClass()) - || (enterprise && annotatedType.getJavaClass().isAssignableFrom(annotatedType.getJavaClass())))) + annotatedMethod.getJavaMember().getDeclaringClass().equals(annotatedType.getJavaClass())) { checkProducerMethodForDeployment(annotatedMethod); boolean specialize = false; 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=1504374&r1=1504373&r2=1504374&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 Thu Jul 18 06:50:03 2013 @@ -708,9 +708,7 @@ public final class WebBeansUtil if(!(candidate instanceof NewBean)) { - if(candidate.getReturnType().equals(superClass) - || (EnterpriseBeanMarker.class.isInstance(candidate) - && superClass.isAssignableFrom(candidate.getBeanClass()))) + if(candidate.getReturnType().equals(superClass)) { superBean = candidates; break; @@ -1002,14 +1000,8 @@ public final class WebBeansUtil { AbstractOwbBean bean = (AbstractOwbBean)it.next(); - boolean enterprise = false; - if(bean instanceof EnterpriseBeanMarker) - { - enterprise = true; - } - - if (bean.getTypes().contains(clazz) || - (enterprise && clazz.isAssignableFrom(bean.getBeanClass()))) + if (bean.getTypes().contains(clazz) + || (EnterpriseBeanMarker.class.isInstance(bean) && bean.getBeanClass().isAssignableFrom(clazz))) { if(annotate) {