svn commit: r1431256 - in /openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans: component/creation/CdiInterceptorBeanBuilder.java intercept/InterceptorComparator.java

[struberg]

Author: struberg
Date: Thu Jan 10 10:23:06 2013
New Revision: 1431256

URL: http://svn.apache.org/viewvc?rev=1431256&view=rev
Log:
OWB-344 fix InterceptorComparator

Modified:
    
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/CdiInterceptorBeanBuilder.java
    
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorComparator.java

Modified: 
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/CdiInterceptorBeanBuilder.java
URL: 
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/CdiInterceptorBeanBuilder.java?rev=1431256&r1=1431255&r2=1431256&view=diff
==============================================================================
--- 
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/CdiInterceptorBeanBuilder.java
 (original)
+++ 
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/CdiInterceptorBeanBuilder.java
 Thu Jan 10 10:23:06 2013
@@ -35,4 +35,8 @@ public abstract class CdiInterceptorBean
     }
 
 
+    public CdiInterceptorBean<T> getBean()
+    {
+        return (CdiInterceptorBean<T>)super.getBean();
+    }
 }

Modified: 
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorComparator.java
URL: 
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorComparator.java?rev=1431256&r1=1431255&r2=1431256&view=diff
==============================================================================
--- 
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorComparator.java
 (original)
+++ 
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorComparator.java
 Thu Jan 10 10:23:06 2013
@@ -23,7 +23,6 @@ import java.util.Comparator;
 import javax.enterprise.inject.spi.Interceptor;
 
 import org.apache.webbeans.config.WebBeansContext;
-import 
org.apache.webbeans.intercept.webbeans.WebBeansInterceptorBeanPleaseRemove;
 
 public class InterceptorComparator<T> implements Comparator<Interceptor<T>>
 {
@@ -37,8 +36,6 @@ public class InterceptorComparator<T> im
 
     public int compare(Interceptor<T> o1, Interceptor<T> o2)
     {
-        WebBeansInterceptorBeanPleaseRemove<T> src = 
(WebBeansInterceptorBeanPleaseRemove<T>) o1;
-        WebBeansInterceptorBeanPleaseRemove<T> target = 
(WebBeansInterceptorBeanPleaseRemove<T>) o2;
 
         if (o1.equals(o2))
         {
@@ -46,8 +43,8 @@ public class InterceptorComparator<T> im
         }
         else
         {
-            Class<?> o1Clazz = src.getClazz();
-            Class<?> o2Clazz = target.getClazz();
+            Class<?> o1Clazz = o1.getBeanClass();
+            Class<?> o2Clazz = o2.getBeanClass();
 
             return interceptorsManager.compare(o1Clazz, o2Clazz);