You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openwebbeans.apache.org by ge...@apache.org on 2010/04/16 00:27:01 UTC
svn commit: r934630 - in /openwebbeans/trunk:
samples/ejb-sample/src/main/java/org/apache/webbeans/sample/ejb/
webbeans-ejb/src/main/java/org/apache/webbeans/ejb/common/component/
webbeans-impl/src/main/java/org/apache/webbeans/portable/creation/
Author: gerdogdu
Date: Thu Apr 15 22:27:00 2010
New Revision: 934630
URL: http://svn.apache.org/viewvc?rev=934630&view=rev
Log:
update for ejb integration
Modified:
openwebbeans/trunk/samples/ejb-sample/src/main/java/org/apache/webbeans/sample/ejb/EchoBean.java
openwebbeans/trunk/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/common/component/BaseEjbBean.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/creation/InjectionTargetProducer.java
Modified: openwebbeans/trunk/samples/ejb-sample/src/main/java/org/apache/webbeans/sample/ejb/EchoBean.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/samples/ejb-sample/src/main/java/org/apache/webbeans/sample/ejb/EchoBean.java?rev=934630&r1=934629&r2=934630&view=diff
==============================================================================
--- openwebbeans/trunk/samples/ejb-sample/src/main/java/org/apache/webbeans/sample/ejb/EchoBean.java (original)
+++ openwebbeans/trunk/samples/ejb-sample/src/main/java/org/apache/webbeans/sample/ejb/EchoBean.java Thu Apr 15 22:27:00 2010
@@ -21,7 +21,7 @@ import org.apache.webbeans.ejb.common.in
@Stateless
@Dependent
-@Interceptors(value=OpenWebBeansEjbInterceptor.class)
+//@Interceptors(value=OpenWebBeansEjbInterceptor.class)
public class EchoBean implements Echo
{
@LogInterceptorBinding
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=934630&r1=934629&r2=934630&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 Thu Apr 15 22:27:00 2010
@@ -138,7 +138,7 @@ public abstract class BaseEjbBean<T> ext
@Override
protected void destroyComponentInstance(T instance, CreationalContext<T> creational)
{
- if(removeStatefulInstance && getEjbType().equals(SessionBeanType.STATEFUL))
+ if(!removeStatefulInstance && getEjbType().equals(SessionBeanType.STATEFUL))
{
//Call remove method
List<Method> methods = getRemoveMethods();
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/creation/InjectionTargetProducer.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/creation/InjectionTargetProducer.java?rev=934630&r1=934629&r2=934630&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/creation/InjectionTargetProducer.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/creation/InjectionTargetProducer.java Thu Apr 15 22:27:00 2010
@@ -113,11 +113,8 @@ public class InjectionTargetProducer<T>
@Override
public void preDestroy(T instance)
{
- InjectionTargetBean<T> bean = getBean(InjectionTargetBean.class);
- if(!(bean instanceof EnterpriseBeanMarker))
- {
- bean.preDestroy(instance,this.creationalContext);
- }
+ InjectionTargetBean<T> bean = getBean(InjectionTargetBean.class);
+ bean.destroyCreatedInstance(instance, this.creationalContext);
}
}
\ No newline at end of file