From commits-return-25440-apmail-tomee-commits-archive=tomee.apache.org@tomee.apache.org Thu Feb 7 13:49:46 2013 Return-Path: X-Original-To: apmail-tomee-commits-archive@www.apache.org Delivered-To: apmail-tomee-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 D5C2AEDD1 for ; Thu, 7 Feb 2013 13:49:46 +0000 (UTC) Received: (qmail 48243 invoked by uid 500); 7 Feb 2013 13:49:46 -0000 Delivered-To: apmail-tomee-commits-archive@tomee.apache.org Received: (qmail 48170 invoked by uid 500); 7 Feb 2013 13:49:46 -0000 Mailing-List: contact commits-help@tomee.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@tomee.apache.org Delivered-To: mailing list commits@tomee.apache.org Received: (qmail 48153 invoked by uid 99); 7 Feb 2013 13:49:45 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 07 Feb 2013 13:49:45 +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, 07 Feb 2013 13:49:44 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 99D072388847; Thu, 7 Feb 2013 13:49:25 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1443471 - /tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiEjbBean.java Date: Thu, 07 Feb 2013 13:49:25 -0000 To: commits@tomee.apache.org From: rmannibucau@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130207134925.99D072388847@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: rmannibucau Date: Thu Feb 7 13:49:25 2013 New Revision: 1443471 URL: http://svn.apache.org/viewvc?rev=1443471&view=rev Log: validation of passivation for EJB shouldn't use directly isPassivationCapable but is the scope passivable Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiEjbBean.java Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiEjbBean.java URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiEjbBean.java?rev=1443471&r1=1443470&r2=1443471&view=diff ============================================================================== --- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiEjbBean.java (original) +++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiEjbBean.java Thu Feb 7 13:49:25 2013 @@ -72,7 +72,8 @@ public class CdiEjbBean extends BaseE @Override // copied to be able to produce EM (should be fixed in OWB for next CDI spec) public void validatePassivationDependencies() { - if(isPassivationCapable()) { + // if(isPassivationCapable()) { + if(getWebBeansContext().getBeanManagerImpl().isPassivatingScope(getScope())) { // not @Dependent otherwise we either can't inject EJB in serializable beans or the opposite final Set beanInjectionPoints = getInjectionPoints(); for(InjectionPoint injectionPoint : beanInjectionPoints) { if(!injectionPoint.isTransient()) { @@ -82,6 +83,7 @@ public class CdiEjbBean extends BaseE || EntityManager.class.equals(injectionPoint.getAnnotated().getBaseType())) { continue; } + throw new WebBeansConfigurationException( "Passivation capable beans must satisfy passivation capable dependencies. " + "Bean : " + toString() + " does not satisfy. Details about the Injection-point: " +