Return-Path: Delivered-To: apmail-openwebbeans-commits-archive@www.apache.org Received: (qmail 99462 invoked from network); 17 Jul 2010 15:21:50 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 17 Jul 2010 15:21:50 -0000 Received: (qmail 72786 invoked by uid 500); 17 Jul 2010 15:21:50 -0000 Delivered-To: apmail-openwebbeans-commits-archive@openwebbeans.apache.org Received: (qmail 72746 invoked by uid 500); 17 Jul 2010 15:21:49 -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 72734 invoked by uid 99); 17 Jul 2010 15:21:49 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 17 Jul 2010 15:21:48 +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; Sat, 17 Jul 2010 15:21:46 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id E87132388906; Sat, 17 Jul 2010 15:20:52 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r965095 - in /openwebbeans/trunk/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/common: component/BaseEjbBean.java proxy/EjbBeanProxyHandler.java Date: Sat, 17 Jul 2010 15:20:52 -0000 To: commits@openwebbeans.apache.org From: covener@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100717152052.E87132388906@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: covener Date: Sat Jul 17 15:20:52 2010 New Revision: 965095 URL: http://svn.apache.org/viewvc?rev=965095&view=rev Log: rename a variable and its setter. removeStatefulInstance = true really means the stateful instance has already been removed, but sounds too much like it is "to be" removed by the container. Modified: openwebbeans/trunk/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/common/component/BaseEjbBean.java 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/component/BaseEjbBean.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/common/component/BaseEjbBean.java?rev=965095&r1=965094&r2=965095&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/common/component/BaseEjbBean.java (original) +++ openwebbeans/trunk/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/common/component/BaseEjbBean.java Sat Jul 17 15:20:52 2010 @@ -42,8 +42,8 @@ public abstract class BaseEjbBean ext /**Injected reference local interface type*/ protected Class iface = null; - /**Remove stateful bean instance*/ - protected boolean removeStatefulInstance = false; + /** Has the stateful instance already been removed by a business method invocation */ + protected boolean removedStatefulInstance = false; /** * Creates a new instance of the session bean. @@ -75,9 +75,9 @@ public abstract class BaseEjbBean ext * Sets remove flag. * @param remove flag */ - public void setRemoveStatefulInstance(boolean remove) + public void setRemovedStatefulInstance(boolean remove) { - this.removeStatefulInstance = remove; + this.removedStatefulInstance = remove; } @@ -140,7 +140,7 @@ public abstract class BaseEjbBean ext @Override protected void destroyComponentInstance(T instance, CreationalContext creational) { - if(!removeStatefulInstance && getEjbType().equals(SessionBeanType.STATEFUL)) + if(!removedStatefulInstance && getEjbType().equals(SessionBeanType.STATEFUL)) { //Call remove method List methods = getRemoveMethods(); 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=965095&r1=965094&r2=965095&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 Sat Jul 17 15:20:52 2010 @@ -116,7 +116,7 @@ public class EjbBeanProxyHandler impleme { if(checkEjbRemoveMethod(method)) { - this.ejbBean.setRemoveStatefulInstance(true); + this.ejbBean.setRemovedStatefulInstance(true); } }