svn commit: r965095 - in /openwebbeans/trunk/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/common: component/BaseEjbBean.java proxy/EjbBeanProxyHandler.java

[co...@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<T> 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<T> 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<T> ext
     @Override
     protected void destroyComponentInstance(T instance, CreationalContext<T> creational)
     {
-        if(!removeStatefulInstance && getEjbType().equals(SessionBeanType.STATEFUL))
+        if(!removedStatefulInstance && getEjbType().equals(SessionBeanType.STATEFUL))
         {
             //Call remove method
             List<Method> 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);
                 }
             }