Author: asoldano
Date: 2015-03-30 11:11:57 -0400 (Mon, 30 Mar 2015)
New Revision: 19609
Modified:
stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/JBossWSInvoker.java
Log:
[JBWS-3900] Moving the check on bindingoperation out of the invocation try-finally block
Modified:
stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/JBossWSInvoker.java
===================================================================
---
stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/JBossWSInvoker.java 2015-03-30
13:17:24 UTC (rev 19608)
+++
stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/JBossWSInvoker.java 2015-03-30
15:11:57 UTC (rev 19609)
@@ -132,6 +132,11 @@
{
targetBean = this.getServiceObject(exchange);
}
+ final Method method = (bop == null) ? null : md.getMethod(bop);
+ if (method == null)
+ {
+ throw Messages.MESSAGES.missingBindingOpeartionAndDispatchedMethod();
+ }
//[JBWS-3843] workaround: set the CallbackHandler threadlocal again; as a matter of
fact, if that's in the Exchange,
//DIGEST auth is being used and that will cause the EJB layer to re-do
authentication because of the bug
@@ -143,13 +148,8 @@
{
CallbackHandlerPolicyContextHandler.setCallbackHandler(cbHandler);
}
- Method method = bop == null ? null : md.getMethod(bop);
- if (bop == null && method == null)
- {
- throw Messages.MESSAGES.missingBindingOpeartionAndDispatchedMethod();
- }
obj = invoke(exchange, targetBean,
- adjustMethodAndParams(md.getMethod(bop), exchange, params,
targetBean.getClass()), params);
+ adjustMethodAndParams(method, exchange, params, targetBean.getClass()),
params);
}
finally
{
Show replies by date