You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openwebbeans.apache.org by db...@apache.org on 2011/05/31 23:57:19 UTC
svn commit: r1129936 - in
/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans:
container/BeanManagerImpl.java intercept/InterceptorComparator.java
Author: dblevins
Date: Tue May 31 21:57:18 2011
New Revision: 1129936
URL: http://svn.apache.org/viewvc?rev=1129936&view=rev
Log:
Avoid the static in interceptor comparator
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/BeanManagerImpl.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/container/BeanManagerImpl.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/BeanManagerImpl.java?rev=1129936&r1=1129935&r2=1129936&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/BeanManagerImpl.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/BeanManagerImpl.java Tue May 31 21:57:18 2011
@@ -658,7 +658,7 @@ public class BeanManagerImpl implements
}
- Collections.sort(interceptorList, new InterceptorComparator());
+ Collections.sort(interceptorList, new InterceptorComparator(webBeansContext));
return interceptorList;
}
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=1129936&r1=1129935&r2=1129936&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 Tue May 31 21:57:18 2011
@@ -28,6 +28,13 @@ import org.apache.webbeans.intercept.web
public class InterceptorComparator<T> implements Comparator<Interceptor<T>>
{
+ private final WebBeansContext webBeansContext;
+
+ public InterceptorComparator(WebBeansContext webBeansContext)
+ {
+ this.webBeansContext = webBeansContext;
+ }
+
public int compare(Interceptor<T> o1, Interceptor<T> o2)
{
WebBeansInterceptor<T> src = (WebBeansInterceptor<T>) o1;
@@ -42,7 +49,7 @@ public class InterceptorComparator<T> im
Class<?> o1Clazz = src.getClazz();
Class<?> o2Clazz = target.getClazz();
- return WebBeansContext.getInstance().getInterceptorsManager().compare(o1Clazz, o2Clazz);
+ return webBeansContext.getInterceptorsManager().compare(o1Clazz, o2Clazz);
}
}