You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openwebbeans.apache.org by rm...@apache.org on 2017/06/16 11:59:56 UTC
svn commit: r1798915 - in /openwebbeans/trunk:
webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorsManager.java
webbeans-tck/testng-dev.xml
Author: rmannibucau
Date: Fri Jun 16 11:59:56 2017
New Revision: 1798915
URL: http://svn.apache.org/viewvc?rev=1798915&view=rev
Log:
InterceptorsManager sorting looked way overcomplicated for what it does
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorsManager.java
openwebbeans/trunk/webbeans-tck/testng-dev.xml
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorsManager.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorsManager.java?rev=1798915&r1=1798914&r2=1798915&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorsManager.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorsManager.java Fri Jun 16 11:59:56 2017
@@ -182,15 +182,11 @@ public class InterceptorsManager
targetIndex = priorityInterceptors.getSorted().size() + i;
}
- if (p1 != -1 && p2 != -1)
- {
- return p1 - p2;
- }
- if (p1 == -1 && p2 != -1)
+ if (srcIndex == -1 && targetIndex != -1)
{
return -1;
}
- if (p1 != -1)
+ if (srcIndex != -1 && targetIndex == -1)
{
return 1;
}
Modified: openwebbeans/trunk/webbeans-tck/testng-dev.xml
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-tck/testng-dev.xml?rev=1798915&r1=1798914&r2=1798915&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-tck/testng-dev.xml (original)
+++ openwebbeans/trunk/webbeans-tck/testng-dev.xml Fri Jun 16 11:59:56 2017
@@ -18,7 +18,7 @@
<suite name="JSR-346-TCK" verbose="2" configfailurepolicy="continue">
<test name="JSR-346 TCK">
<classes>
- <class name="org.jboss.cdi.tck.tests.extensions.interceptionFactory.customBean.CustomBeanWithInterceptorTest" />
+ <class name="org.jboss.cdi.tck.tests.interceptors.definition.conflictingenablement.InterceptorConflictingEnablementTest" />
<!--
<class name="org.jboss.cdi.tck.tests.event.parameterized.ParameterizedEventTest" />