Author: ningjiang
Date: Tue May 22 07:57:40 2012
New Revision: 1341340
URL: http://svn.apache.org/viewvc?rev=1341340&view=rev
Log:
Merged revisions 1341332 via svnmerge from
https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes
........
r1341332 | ningjiang | 2012-05-22 15:39:37 +0800 (Tue, 22 May 2012) | 1 line
Fix the CS error of ContextUtils
........
Modified:
cxf/branches/2.4.x-fixes/ (props changed)
cxf/branches/2.4.x-fixes/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/ContextUtils.java
Propchange: cxf/branches/2.4.x-fixes/
------------------------------------------------------------------------------
Merged /cxf/branches/2.5.x-fixes:r1341332
Propchange: cxf/branches/2.4.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
cxf/branches/2.4.x-fixes/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/ContextUtils.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/ContextUtils.java?rev=1341340&r1=1341339&r2=1341340&view=diff
==============================================================================
---
cxf/branches/2.4.x-fixes/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/ContextUtils.java
(original)
+++
cxf/branches/2.4.x-fixes/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/ContextUtils.java
Tue May 22 07:57:40 2012
@@ -465,35 +465,34 @@ public final class ContextUtils {
if (in != null) {
in.cacheInput();
}
-
- if (!robust) {
- // async service invocation required *after* a
response
- // has been sent (i.e. to a oneway, or a partial
response
- // to a decoupled twoway)
+ try {
+ if (!robust) {
+ // async service invocation required *after* a
response
+ // has been sent (i.e. to a oneway, or a
partial response
+ // to a decoupled twoway)
- // pause dispatch on current thread ...
- inMessage.getInterceptorChain().pause();
+ // pause dispatch on current thread ...
+ inMessage.getInterceptorChain().pause();
- try {
// ... and resume on executor thread
getExecutor(inMessage).execute(new Runnable() {
- public void run() {
-
inMessage.getInterceptorChain().resume();
- }
- });
- } catch (RejectedExecutionException e) {
- LOG.warning(
- "Executor queue is full, use the
caller thread."
- + " Users can specify a larger
executor queue to avoid this.");
- // only block the thread if the prop is unset
or set to false, otherwise let it go
- if (!MessageUtils.isTrue(
- inMessage.getContextualProperty(
-
"org.apache.cxf.oneway.rejected_execution_exception"))) {
- //the executor queue is full, so run the
task in the caller thread
- inMessage.getInterceptorChain().resume();
- }
+ public void run() {
+
inMessage.getInterceptorChain().resume();
+ }
+ });
+ }
+ } catch (RejectedExecutionException e) {
+ LOG.warning(
+ "Executor queue is full, use the
caller thread."
+ + " Users can specify a larger
executor queue to avoid this.");
+ // only block the thread if the prop is unset or
set to false, otherwise let it go
+ if (!MessageUtils.isTrue(
+ inMessage.getContextualProperty(
+
"org.apache.cxf.oneway.rejected_execution_exception"))) {
+ //the executor queue is full, so run the task
in the caller thread
+ inMessage.getInterceptorChain().resume();
}
}
}
