openwebbeans-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cove...@apache.org
Subject svn commit: r888547 - in /incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept: InterceptorDataComparator.java WebBeansInterceptorConfig.java
Date Tue, 08 Dec 2009 19:46:34 GMT
Author: covener
Date: Tue Dec  8 19:46:33 2009
New Revision: 888547

URL: http://svn.apache.org/viewvc?rev=888547&view=rev
Log:
[OWB-158] interceptor stack does not honor beans.xml ordering

Honor ordering of @AroundInvoke interceptors.

un-deprecate InterceptorDataComparator, which is needed by the impl and 
can't piggyback on BeanManager.resolveInterceptors() (and doesn't
consume the InterceptorComparator).

Deprecation was part of large commit r773733 that removed the call to
it in the InterceptorHandler itself.


Modified:
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorDataComparator.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/WebBeansInterceptorConfig.java

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorDataComparator.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorDataComparator.java?rev=888547&r1=888546&r2=888547&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorDataComparator.java
(original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorDataComparator.java
Tue Dec  8 19:46:33 2009
@@ -20,13 +20,6 @@
 
 import org.apache.webbeans.intercept.webbeans.WebBeansInterceptor;
 
-/**
- * Uses {@link InterceptorComparator}.
- * 
- * @see InterceptorComparator
- * @see BeanManager#resolveInterceptors(javax.inject.manager.InterceptionType, java.lang.annotation.Annotation...)
- */
-@Deprecated
 public class InterceptorDataComparator implements Comparator<InterceptorData>, Serializable
 {
 

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/WebBeansInterceptorConfig.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/WebBeansInterceptorConfig.java?rev=888547&r1=888546&r2=888547&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/WebBeansInterceptorConfig.java
(original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/WebBeansInterceptorConfig.java
Tue Dec  8 19:46:33 2009
@@ -141,6 +141,7 @@
 
         // Method level interceptors.
         addMethodInterceptors(clazz, stack, componentInterceptors);
+        Collections.sort(stack, new InterceptorDataComparator());
 
     }
 



Mime
View raw message