cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1329948 - in /cxf/branches/2.3.x-fixes: ./ rt/core/src/main/java/org/apache/cxf/interceptor/OneWayProcessorInterceptor.java
Date Tue, 24 Apr 2012 19:05:29 GMT
Author: dkulp
Date: Tue Apr 24 19:05:28 2012
New Revision: 1329948

URL: http://svn.apache.org/viewvc?rev=1329948&view=rev
Log:
Merged revisions 1329936 via  svn merge from
https://svn.us.apache.org/repos/asf/cxf/branches/2.4.x-fixes

........
  r1329936 | dkulp | 2012-04-24 14:51:49 -0400 (Tue, 24 Apr 2012) | 17 lines
  
  Merged revisions 1329924 via  svn merge from
  https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes
  
  ........
    r1329924 | dkulp | 2012-04-24 14:42:18 -0400 (Tue, 24 Apr 2012) | 9 lines
    
    Merged revisions 1328598 via  git cherry-pick from
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1328598 | ay | 2012-04-21 03:24:21 -0400 (Sat, 21 Apr 2012) | 2 lines
    
      [CXF-4257] add an option for RejectedExecutionException handling for onway
    
    ........
  ........
  
........

Modified:
    cxf/branches/2.3.x-fixes/   (props changed)
    cxf/branches/2.3.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/OneWayProcessorInterceptor.java

Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: cxf/branches/2.3.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/OneWayProcessorInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/OneWayProcessorInterceptor.java?rev=1329948&r1=1329947&r2=1329948&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/OneWayProcessorInterceptor.java
(original)
+++ cxf/branches/2.3.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/OneWayProcessorInterceptor.java
Tue Apr 24 19:05:28 2012
@@ -136,11 +136,17 @@ public class OneWayProcessorInterceptor 
                         lock.wait(20);
                     }
                 } catch (RejectedExecutionException e) {
-                    //the executor queue is full, so run the task in the caller thread
                     LOG.warning(
                         "Executor queue is full, run the oneway invocation task in caller
thread." 
                         + "  Users can specify a larger executor queue to avoid this.");
-                    chain.resume();
+                    // only block the thread if the prop is unset or set to false, otherwise
let it go
+                    if (!MessageUtils.isTrue(
+                        message.getContextualProperty(
+                            "org.apache.cxf.oneway.rejected_execution_exception"))) {
+                        //the executor queue is full, so run the task in the caller thread
+                        chain.resume();
+                    }
+                    
                 } catch (InterruptedException e) {
                     //ignore - likely a busy work queue so we'll just let the one-way go
                 }



Mime
View raw message