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/02/15 21:36:35 UTC
svn commit: r910330 -
/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ManagedBean.java
Author: gerdogdu
Date: Mon Feb 15 20:36:35 2010
New Revision: 910330
URL: http://svn.apache.org/viewvc?rev=910330&view=rev
Log:
[OWB-283] serializable check on Interceptor and Decorator
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ManagedBean.java
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ManagedBean.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ManagedBean.java?rev=910330&r1=910329&r2=910330&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ManagedBean.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ManagedBean.java Mon Feb 15 20:36:35 2010
@@ -93,7 +93,7 @@
{
for(Decorator<?> dec : this.decorators)
{
- if(!Serializable.class.isAssignableFrom(dec.getBeanClass()))
+ if(dec.getBeanClass() != null && !Serializable.class.isAssignableFrom(dec.getBeanClass()))
{
return false;
}
@@ -101,7 +101,8 @@
for(InterceptorData interceptorData : this.interceptorStack)
{
- if(!(interceptorData.getInterceptorInstance() instanceof Serializable))
+ Object interceptor = interceptorData.getInterceptorInstance();
+ if(interceptor != null && !(interceptor instanceof Serializable))
{
return false;
}