openwebbeans-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a...@apache.org
Subject svn commit: r1502877 - in /openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans: component/creation/InterceptorBeanBuilder.java intercept/InterceptorUtil.java
Date Sat, 13 Jul 2013 20:55:04 GMT
Author: arne
Date: Sat Jul 13 20:55:03 2013
New Revision: 1502877

URL: http://svn.apache.org/r1502877
Log:
OWB-846: Fixed interceptor-order for lifecycle interceptors

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

Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/InterceptorBeanBuilder.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/InterceptorBeanBuilder.java?rev=1502877&r1=1502876&r2=1502877&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/InterceptorBeanBuilder.java
(original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/InterceptorBeanBuilder.java
Sat Jul 13 20:55:03 2013
@@ -262,8 +262,6 @@ public abstract class InterceptorBeanBui
 
     private void checkAroundInvokeConditions(AnnotatedMethod method)
     {
-        AnnotatedType annotatedType = method.getDeclaringType();
-
         List<AnnotatedParameter<T>> parameters = method.getParameters();
         List<Class<?>> clazzParameters = new ArrayList<Class<?>>();
         for(AnnotatedParameter<T> parameter : parameters)
@@ -324,7 +322,7 @@ public abstract class InterceptorBeanBui
             if (alreadyDefined.getJavaMember().getDeclaringClass() == clazz)
             {
                 throw new WebBeansConfigurationException("Only one Interceptor of a certain
type is allowed per class, but multiple found in class "
-                        + annotatedMethod.getDeclaringType().getJavaClass().getName()
+                        + annotatedMethod.getJavaMember().getDeclaringClass().getName()
                         + " methods: " + annotatedMethod.getJavaMember().toString()
                         + " and " + alreadyDefined.getJavaMember().toString());
             }

Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorUtil.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorUtil.java?rev=1502877&r1=1502876&r2=1502877&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorUtil.java
(original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorUtil.java
Sat Jul 13 20:55:03 2013
@@ -69,7 +69,7 @@ public final class InterceptorUtil
         {
             for (AnnotatedMethod<?> annotatedMethod : annotatedType.getMethods())
             {
-                if (annotatedMethod.getDeclaringType().getJavaClass() != clazz)
+                if (annotatedMethod.getJavaMember().getDeclaringClass() != clazz)
                 {
                     continue;
                 }



Mime
View raw message