Repository: spark Updated Branches: refs/heads/branch-1.1 ff616fd7b -> d892062cc
[FIX] fix error message in sendMessageReliably rxin Author: Xiangrui Meng <[email protected]> Closes #2120 from mengxr/sendMessageReliably and squashes the following commits: b14400c [Xiangrui Meng] fix error message in sendMessageReliably (cherry picked from commit fd8ace2d9a796f69ce34ad202907008cd6e4d274) Signed-off-by: Josh Rosen <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/d892062c Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/d892062c Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/d892062c Branch: refs/heads/branch-1.1 Commit: d892062cca16bd9d977e1cf51723135a481edf57 Parents: ff616fd Author: Xiangrui Meng <[email protected]> Authored: Mon Aug 25 14:55:20 2014 -0700 Committer: Josh Rosen <[email protected]> Committed: Mon Aug 25 14:55:34 2014 -0700 ---------------------------------------------------------------------- .../main/scala/org/apache/spark/network/ConnectionManager.scala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/d892062c/core/src/main/scala/org/apache/spark/network/ConnectionManager.scala ---------------------------------------------------------------------- diff --git a/core/src/main/scala/org/apache/spark/network/ConnectionManager.scala b/core/src/main/scala/org/apache/spark/network/ConnectionManager.scala index e5e1e72..578d806 100644 --- a/core/src/main/scala/org/apache/spark/network/ConnectionManager.scala +++ b/core/src/main/scala/org/apache/spark/network/ConnectionManager.scala @@ -851,8 +851,8 @@ private[spark] class ConnectionManager( messageStatuses.synchronized { messageStatuses.remove(message.id).foreach ( s => { promise.failure( - new IOException(s"sendMessageReliably failed because ack " + - "was not received within ${ackTimeout} sec")) + new IOException("sendMessageReliably failed because ack " + + s"was not received within $ackTimeout sec")) }) } } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
