Return-Path: Delivered-To: apmail-openwebbeans-commits-archive@www.apache.org Received: (qmail 83920 invoked from network); 15 Jul 2010 22:17:13 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 15 Jul 2010 22:17:13 -0000 Received: (qmail 33836 invoked by uid 500); 15 Jul 2010 22:17:13 -0000 Delivered-To: apmail-openwebbeans-commits-archive@openwebbeans.apache.org Received: (qmail 33795 invoked by uid 500); 15 Jul 2010 22:17:12 -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 33787 invoked by uid 99); 15 Jul 2010 22:17:12 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 15 Jul 2010 22:17:12 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.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, 15 Jul 2010 22:17:09 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 0471E238899C; Thu, 15 Jul 2010 22:16:16 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r964628 - /openwebbeans/trunk/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/common/interceptor/OpenWebBeansEjbInterceptor.java Date: Thu, 15 Jul 2010 22:16:15 -0000 To: commits@openwebbeans.apache.org From: gerdogdu@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100715221616.0471E238899C@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: gerdogdu Date: Thu Jul 15 22:16:15 2010 New Revision: 964628 URL: http://svn.apache.org/viewvc?rev=964628&view=rev Log: Call proceed.context for non-contextual EJB Modified: openwebbeans/trunk/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/common/interceptor/OpenWebBeansEjbInterceptor.java Modified: openwebbeans/trunk/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/common/interceptor/OpenWebBeansEjbInterceptor.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/common/interceptor/OpenWebBeansEjbInterceptor.java?rev=964628&r1=964627&r2=964628&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/common/interceptor/OpenWebBeansEjbInterceptor.java (original) +++ openwebbeans/trunk/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/common/interceptor/OpenWebBeansEjbInterceptor.java Thu Jul 15 22:16:15 2010 @@ -452,9 +452,9 @@ public class OpenWebBeansEjbInterceptor rv.INTERCEPTOR_OR_DECORATOR_CALL = false; if(ejbBean == null) { - if (logger.wblWillLogWarn()) + if (logger.wblWillLogDebug()) { - logger.warn(OWBLogConst.WARN_0008, instance.getClass(), manager.getComponents()); + logger.debug(OWBLogConst.WARN_0008, instance.getClass(), manager.getComponents()); } return rv; } @@ -627,40 +627,43 @@ public class OpenWebBeansEjbInterceptor BeanManagerImpl manager = BeanManagerImpl.getManager(); Object instance = ejbContext.getTarget(); - BaseEjbBean bean = findTargetBean(instance); - if (bean == null) + try { - logger.debug("No bean for instance [{0}]", instance); - return; - } - - List interceptorStack = bean.getInterceptorStack(); - - if (interceptorStack.size() > 0 && WebBeansUtil.isContainsInterceptorMethod(interceptorStack, interceptorType)) - { - localcc = manager.createCreationalContext(null); - InvocationContextImpl impl = new InvocationContextImpl(null, instance, null, null, - InterceptorUtil.getInterceptorMethods(interceptorStack, interceptorType), interceptorType); - impl.setCreationalContext(localcc); + BaseEjbBean bean = findTargetBean(instance); + if (bean == null) + { + logger.debug("No bean for instance [{0}]", instance); + ejbContext.proceed(); + return; + } + + List interceptorStack = bean.getInterceptorStack(); - try + if (interceptorStack.size() > 0 && WebBeansUtil.isContainsInterceptorMethod(interceptorStack, interceptorType)) { - impl.proceed(); + localcc = manager.createCreationalContext(null); + + InvocationContextImpl impl = new InvocationContextImpl(null, instance, null, null, + InterceptorUtil.getInterceptorMethods(interceptorStack, interceptorType), interceptorType); + impl.setCreationalContext(localcc); + + try + { + impl.proceed(); + } + catch (Exception e) + { + logger.error(OWBLogConst.ERROR_0008, e, interceptorType); + } + } + else + { + logger.debug("No lifecycle interceptors for [{0}]", instance); } - catch (Exception e) - { - logger.error(OWBLogConst.ERROR_0008, e, interceptorType); - } - } - else - { - logger.debug("No lifecycle interceptors for [{0}]", instance); - } - - try - { - ejbContext.proceed(); + + //Call next interceptor + ejbContext.proceed(); } catch (Exception e) {