You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openwebbeans.apache.org by st...@apache.org on 2010/04/12 17:50:43 UTC
svn commit: r933292 -
/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorHandler.java
Author: struberg
Date: Mon Apr 12 15:50:43 2010
New Revision: 933292
URL: http://svn.apache.org/viewvc?rev=933292&view=rev
Log:
OWB-351 fix CreationalContext detection
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorHandler.java
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorHandler.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorHandler.java?rev=933292&r1=933291&r2=933292&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorHandler.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorHandler.java Mon Apr 12 15:50:43 2010
@@ -169,11 +169,13 @@ public abstract class InterceptorHandler
* @param method business method
* @param proceed proceed method
* @param arguments method arguments
- * @param ownerCreationalContext bean creational context
+ * @param creationalContext bean creational context
* @return method result
* @throws Exception for exception
*/
- public Object invoke(Object instance, Method method, Method proceed, Object[] arguments, CreationalContextImpl<?> ownerCreationalContext) throws Exception
+ public Object invoke(Object instance, Method method, Method proceed, Object[] arguments,
+ CreationalContextImpl<?> creationalContext)
+ throws Exception
{
//Result of invocation
Object result = null;
@@ -210,7 +212,7 @@ public abstract class InterceptorHandler
((ProxyObject)delegate).setHandler(this.delegateHandler);
// Gets component decorator stack
- decorators = WebBeansDecoratorConfig.getDecoratorStack(injectionTarget, instance, delegate, ownerCreationalContext);
+ decorators = WebBeansDecoratorConfig.getDecoratorStack(injectionTarget, instance, delegate, creationalContext);
//Sets decorator stack of delegate
this.delegateHandler.setDecorators(decorators);
@@ -247,7 +249,10 @@ public abstract class InterceptorHandler
// Call Around Invokes
if (WebBeansUtil.isContainsInterceptorMethod(this.interceptedMethodMap.get(method), InterceptorType.AROUND_INVOKE))
{
- return callAroundInvokes(method, arguments, InterceptorUtil.getInterceptorMethods(this.interceptedMethodMap.get(method), InterceptorType.AROUND_INVOKE));
+ return callAroundInvokes(method, arguments,
+ InterceptorUtil.getInterceptorMethods(this.interceptedMethodMap.get(method),
+ InterceptorType.AROUND_INVOKE),
+ creationalContext);
}
}
@@ -302,7 +307,9 @@ public abstract class InterceptorHandler
* @return return of method
* @throws Exception for any exception
*/
- protected abstract Object callAroundInvokes(Method interceptedMethod, Object[] arguments, List<InterceptorData> stack) throws Exception;
+ protected abstract Object callAroundInvokes(Method interceptedMethod, Object[] arguments,
+ List<InterceptorData> stack, CreationalContextImpl<?> creationalContext)
+ throws Exception;
/**
*