svn commit: r911867 - in /openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept: InterceptorHandler.java InvocationContextImpl.java

[st...@apache.org]

Author: struberg
Date: Fri Feb 19 16:56:39 2010
New Revision: 911867

URL: http://svn.apache.org/viewvc?rev=911867&view=rev
Log:
OWB-291 fix ClassCastException in InterceptorHandler

Modified:
    openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorHandler.java
    openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InvocationContextImpl.java

Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorHandler.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorHandler.java?rev=911867&r1=911866&r2=911867&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorHandler.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorHandler.java Fri Feb 19 16:56:39 2010
@@ -32,8 +32,8 @@
 import javax.interceptor.Interceptors;
 
 import org.apache.webbeans.component.AbstractOwbBean;
-import org.apache.webbeans.component.AbstractInjectionTargetBean;
 import org.apache.webbeans.component.InjectionTargetBean;
+import org.apache.webbeans.component.OwbBean;
 import org.apache.webbeans.config.BeansDeployer;
 import org.apache.webbeans.config.DefinitionUtil;
 import org.apache.webbeans.container.BeanManagerImpl;
@@ -144,7 +144,7 @@
 {
     private static final WebBeansLogger logger = WebBeansLogger.getLogger(InterceptorHandler.class);
     
-    protected AbstractOwbBean<?> bean = null;
+    protected OwbBean<?> bean = null;
 
     protected InterceptorHandler(AbstractOwbBean<?> bean)
     {
@@ -371,7 +371,7 @@
     {
         if( s.readByte() == 1)
         {
-            this.bean = (AbstractInjectionTargetBean<?>)BeanManagerImpl.getManager().getPassivationCapableBean(s.readUTF());   
+            this.bean = (OwbBean<?>)BeanManagerImpl.getManager().getPassivationCapableBean(s.readUTF());
         }
         else
         {

Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InvocationContextImpl.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InvocationContextImpl.java?rev=911867&r1=911866&r2=911867&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InvocationContextImpl.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InvocationContextImpl.java Fri Feb 19 16:56:39 2010
@@ -24,7 +24,7 @@
 import javax.enterprise.context.spi.CreationalContext;
 import javax.interceptor.InvocationContext;
 
-import org.apache.webbeans.component.AbstractOwbBean;
+import org.apache.webbeans.component.OwbBean;
 import org.apache.webbeans.container.BeanManagerImpl;
 
 /**
@@ -67,7 +67,7 @@
      * @param datas interceptor stack
      * @param type interceptor type
      */
-    public InvocationContextImpl(AbstractOwbBean<?> bean, Object instance, Method method, Object[] parameters, List<InterceptorData> datas, InterceptorType type)
+    public InvocationContextImpl(OwbBean<?> bean, Object instance, Method method, Object[] parameters, List<InterceptorData> datas, InterceptorType type)
     {
         this.method = method;
         this.parameters = parameters;
@@ -91,7 +91,7 @@
 
     
     @SuppressWarnings("unchecked")
-    private void configureTarget(AbstractOwbBean<?> bean)
+    private void configureTarget(OwbBean<?> bean)
     {
         Context webbeansContext = BeanManagerImpl.getManager().getContext(bean.getScope());