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 2012/08/10 19:32:56 UTC
svn commit: r1371780 -
/cxf/branches/2.6.x-fixes/api/src/main/java/org/apache/cxf/endpoint/ClientImpl.java
Author: dkulp
Date: Fri Aug 10 17:32:56 2012
New Revision: 1371780
URL: http://svn.apache.org/viewvc?rev=1371780&view=rev
Log:
Merged revisions 1371777 via git cherry-pick from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1371777 | dkulp | 2012-08-10 13:29:25 -0400 (Fri, 10 Aug 2012) | 2 lines
When using an async transport, make sure an exception is thrown on a timeout, not a null return;
........
Modified:
cxf/branches/2.6.x-fixes/api/src/main/java/org/apache/cxf/endpoint/ClientImpl.java
Modified: cxf/branches/2.6.x-fixes/api/src/main/java/org/apache/cxf/endpoint/ClientImpl.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/api/src/main/java/org/apache/cxf/endpoint/ClientImpl.java?rev=1371780&r1=1371779&r2=1371780&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/api/src/main/java/org/apache/cxf/endpoint/ClientImpl.java (original)
+++ cxf/branches/2.6.x-fixes/api/src/main/java/org/apache/cxf/endpoint/ClientImpl.java Fri Aug 10 17:32:56 2012
@@ -674,7 +674,7 @@ public class ClientImpl
}
}
- protected void waitResponse(Exchange exchange) {
+ protected void waitResponse(Exchange exchange) throws IOException {
int remaining = synchronousTimeout;
while (!Boolean.TRUE.equals(exchange.get(FINISHED)) && remaining > 0) {
long start = System.currentTimeMillis();
@@ -689,6 +689,10 @@ public class ClientImpl
if (!Boolean.TRUE.equals(exchange.get(FINISHED))) {
LogUtils.log(LOG, Level.WARNING, "RESPONSE_TIMEOUT",
exchange.get(OperationInfo.class).getName().toString());
+ String msg = new org.apache.cxf.common.i18n.Message("RESPONSE_TIMEOUT", LOG,
+ exchange.get(OperationInfo.class).getName().toString())
+ .toString();
+ throw new IOException(msg);
}
}