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/12 16:29:10 UTC
svn commit: r1372111 -
/cxf/branches/2.4.x-fixes/rt/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java
Author: dkulp
Date: Sun Aug 12 14:29:10 2012
New Revision: 1372111
URL: http://svn.apache.org/viewvc?rev=1372111&view=rev
Log:
Merged revisions 1372104 via git cherry-pick from
https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes
........
r1372104 | dkulp | 2012-08-12 10:26:59 -0400 (Sun, 12 Aug 2012) | 18 lines
Merged revisions 1371780 via git cherry-pick from
https://svn.apache.org/repos/asf/cxf/branches/2.6.x-fixes
........
r1371780 | dkulp | 2012-08-10 13:32:56 -0400 (Fri, 10 Aug 2012) | 10 lines
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.4.x-fixes/rt/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java
Modified: cxf/branches/2.4.x-fixes/rt/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java?rev=1372111&r1=1372110&r2=1372111&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/rt/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java (original)
+++ cxf/branches/2.4.x-fixes/rt/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java Sun Aug 12 14:29:10 2012
@@ -670,7 +670,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();
@@ -685,6 +685,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);
}
}