You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openwebbeans.apache.org by co...@apache.org on 2009/12/15 22:57:06 UTC
svn commit: r891022 -
/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorDataComparator.java
Author: covener
Date: Tue Dec 15 21:57:06 2009
New Revision: 891022
URL: http://svn.apache.org/viewvc?rev=891022&view=rev
Log:
[OWB-189] Interceptors declared with @Interceptors run before, not after, JCDI interceptors
Modified:
incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorDataComparator.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=891022&r1=891021&r2=891022&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 15 21:57:06 2009
@@ -46,14 +46,14 @@
return 0;
}
+ /* If either is an EJB-style interceptor (@Interceptors or ejb-jar.xml), it is higher priority */
if (interceptorFirst == null)
{
-
- return 1;
+ return -1;
}
else if (interceptorSecond == null)
{
- return -1;
+ return 1;
}
else
{