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 C7682D875 for ; Thu, 15 Nov 2012 10:32:29 +0000 (UTC) Received: (qmail 72711 invoked by uid 500); 15 Nov 2012 10:32:29 -0000 Delivered-To: apmail-openwebbeans-commits-archive@openwebbeans.apache.org Received: (qmail 72616 invoked by uid 500); 15 Nov 2012 10:32:26 -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 72573 invoked by uid 99); 15 Nov 2012 10:32:25 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 15 Nov 2012 10:32: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, 15 Nov 2012 10:32:24 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id C901A23888E7 for ; Thu, 15 Nov 2012 10:32:03 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1409721 - /openwebbeans/trunk/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/common/proxy/EjbBeanProxyHandler.java Date: Thu, 15 Nov 2012 10:32:03 -0000 To: commits@openwebbeans.apache.org From: gerdogdu@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20121115103203.C901A23888E7@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: gerdogdu Date: Thu Nov 15 10:32:02 2012 New Revision: 1409721 URL: http://svn.apache.org/viewvc?rev=1409721&view=rev Log: Enable protected fields for being extended with subclasses. Modified: openwebbeans/trunk/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/common/proxy/EjbBeanProxyHandler.java Modified: openwebbeans/trunk/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/common/proxy/EjbBeanProxyHandler.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/common/proxy/EjbBeanProxyHandler.java?rev=1409721&r1=1409720&r2=1409721&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/common/proxy/EjbBeanProxyHandler.java (original) +++ openwebbeans/trunk/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/common/proxy/EjbBeanProxyHandler.java Thu Nov 15 10:32:02 2012 @@ -58,21 +58,21 @@ import org.apache.webbeans.proxy.MethodH public class EjbBeanProxyHandler implements InvocationHandler, MethodHandler, Serializable, Externalizable { //Logger instance - private final static Logger logger = WebBeansLoggerFacade.getLogger(EjbBeanProxyHandler.class); + protected final static Logger logger = WebBeansLoggerFacade.getLogger(EjbBeanProxyHandler.class); /**Proxy ejb bean instance*/ - private BaseEjbBean ejbBean; + protected BaseEjbBean ejbBean; /**Dependent ejb instance*/ - private Object dependentEJB; + protected Object dependentEJB; /**Scope is dependent*/ - private boolean isDependent = false; + protected boolean isDependent = false; /**Creational Context*/ - private CreationalContext creationalContext; + protected CreationalContext creationalContext; - private WebBeansContext webBeansContext; + protected WebBeansContext webBeansContext; //DO NOT REMOVE, used by PASSIVATION. public EjbBeanProxyHandler() @@ -86,8 +86,9 @@ public class EjbBeanProxyHandler impleme public EjbBeanProxyHandler(BaseEjbBean ejbBean, CreationalContext creationalContext) { this.ejbBean = ejbBean; - - if(ejbBean.getWebBeansContext().getWebBeansUtil().isScopeTypeNormal(ejbBean.getScope())) + this.webBeansContext = ejbBean.getWebBeansContext(); + + if(this.webBeansContext.getWebBeansUtil().isScopeTypeNormal(ejbBean.getScope())) { initiateBeanBag((OwbBean)ejbBean, (CreationalContext)creationalContext); } @@ -101,7 +102,6 @@ public class EjbBeanProxyHandler impleme isDependent = true; dependentEJB = null; } - webBeansContext = ejbBean.getWebBeansContext(); } public Object invoke(Object instance, Method method, Method proceed, Object[] arguments) throws Throwable