You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2011/10/13 18:45:10 UTC
svn commit: r1182971 - in /cxf/branches/2.3.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
Author: dkulp
Date: Thu Oct 13 16:45:09 2011
New Revision: 1182971
URL: http://svn.apache.org/viewvc?rev=1182971&view=rev
Log:
Merged revisions 1179691 via svnmerge from
https://svn.us.apache.org/repos/asf/cxf/branches/2.4.x-fixes
................
r1179691 | dkulp | 2011-10-06 12:21:29 -0400 (Thu, 06 Oct 2011) | 10 lines
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.3.x-fixes/ (props changed)
cxf/branches/2.3.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
cxf/branches/2.3.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/Messages.properties
Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.3.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java?rev=1182971&r1=1182970&r2=1182971&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java (original)
+++ cxf/branches/2.3.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java Thu Oct 13 16:45:09 2011
@@ -43,6 +43,7 @@ import java.util.Set;
import java.util.TreeMap;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.Executor;
+import java.util.concurrent.RejectedExecutionException;
import java.util.logging.Level;
import java.util.logging.Logger;
import java.util.regex.Pattern;
@@ -2262,7 +2263,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();
+ }
}
}
protected void handleResponseInternal() throws IOException {
Modified: cxf/branches/2.3.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/Messages.properties
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/Messages.properties?rev=1182971&r1=1182970&r2=1182971&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/Messages.properties (original)
+++ cxf/branches/2.3.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/Messages.properties Thu Oct 13 16:45:09 2011
@@ -25,3 +25,6 @@ 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.
+EXECUTOR_FULL = Executor rejected background task to retrieve the response, running on current thread.
+