Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@cxf.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1179691 - in /cxf/branches/2.4.x-fixes: ./
 rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
 rt/transports/http/src/main/java/org/apache/cxf/transport/http/Messages.properties
Date: Thu, 06 Oct 2011 16:21:30 -0000
To: commits@cxf.apache.org
From: dkulp@apache.org
Message-Id: <20111006162130.56D8023889DA@eris.apache.org>

Author: dkulp
Date: Thu Oct  6 16:21:29 2011
New Revision: 1179691

URL: http://svn.apache.org/viewvc?rev=1179691&view=rev
Log:
Merged revisions 1179687 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r1179687 | dkulp | 2011-10-06 12:15:00 -0400 (Thu, 06 Oct 2011) | 2 lines
  
  If the executor rejects the request, just run on the local thread and
  warn.
........

Modified:
    cxf/branches/2.4.x-fixes/   (props changed)
    cxf/branches/2.4.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
    cxf/branches/2.4.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/Messages.properties

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

Modified: cxf/branches/2.4.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java?rev=1179691&r1=1179690&r2=1179691&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java (original)
+++ cxf/branches/2.4.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java Thu Oct  6 16:21:29 2011
@@ -37,6 +37,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.Executor;
+import java.util.concurrent.RejectedExecutionException;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -1514,7 +1515,12 @@ public class HTTPConduit 
                     outMessage.getExchange().put(Executor.class.getName() 
                                                  + ".USING_SPECIFIED", Boolean.TRUE);
                 }
-                ex.execute(runnable);
+                try {
+                    ex.execute(runnable);
+                } catch (RejectedExecutionException rex) {
+                    LOG.warning("EXECUTOR_FULL");
+                    handleResponseInternal();
+                }
             }
         }
 

Modified: cxf/branches/2.4.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/Messages.properties
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/Messages.properties?rev=1179691&r1=1179690&r2=1179691&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/Messages.properties (original)
+++ cxf/branches/2.4.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/Messages.properties Thu Oct  6 16:21:29 2011
@@ -25,4 +25,5 @@ DECOUPLED_RESPONSE_FAILED_MSG = Decouple
 MISSING_PATH_INFO = PATH_INFO not present in message context, multiplex id is unavailable. Ensure the portName passed to getCurrentEndpointReferenceId is correct if the service has multiple ports
 INVALID_ENCODING_MSG = Invalid character set {0} in request.
 INVALID_TIMEOUT_FORMAT = Invalid name/value pair {0}={1} set in RequestConext 
-NO_HTTP_DESTINATION_FACTORY_FOUND = Cannot find any registered HttpDestinationFactory from the Bus.
\ No newline at end of file
+NO_HTTP_DESTINATION_FACTORY_FOUND = Cannot find any registered HttpDestinationFactory from the Bus.
+EXECUTOR_FULL = Executor rejected background task to retrieve the response, running on current thread.
\ No newline at end of file