You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by te...@apache.org on 2015/02/10 18:42:32 UTC
hbase git commit: HBASE-13004 Addendum fixes timeout value in message
(Andrey Stepachev)
Repository: hbase
Updated Branches:
refs/heads/branch-1 8fdc5bdb2 -> 968c4574d
HBASE-13004 Addendum fixes timeout value in message (Andrey Stepachev)
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/968c4574
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/968c4574
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/968c4574
Branch: refs/heads/branch-1
Commit: 968c4574d779b569b1d70b929c47b8a6b244fc4b
Parents: 8fdc5bd
Author: tedyu <yu...@gmail.com>
Authored: Tue Feb 10 09:42:28 2015 -0800
Committer: tedyu <yu...@gmail.com>
Committed: Tue Feb 10 09:42:28 2015 -0800
----------------------------------------------------------------------
hbase-common/src/test/java/org/apache/hadoop/hbase/Waiter.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/968c4574/hbase-common/src/test/java/org/apache/hadoop/hbase/Waiter.java
----------------------------------------------------------------------
diff --git a/hbase-common/src/test/java/org/apache/hadoop/hbase/Waiter.java b/hbase-common/src/test/java/org/apache/hadoop/hbase/Waiter.java
index 9e72ddb..0972cbd 100644
--- a/hbase-common/src/test/java/org/apache/hadoop/hbase/Waiter.java
+++ b/hbase-common/src/test/java/org/apache/hadoop/hbase/Waiter.java
@@ -207,11 +207,11 @@ public final class Waiter {
} else if (failIfTimeout) {
String msg = getExplanation(predicate);
Assert.fail(MessageFormat
- .format("Waiting timed out after [{0}] msec" + msg, adjustedTimeout));
+ .format("Waiting timed out after [{0}] msec", adjustedTimeout) + msg);
} else {
String msg = getExplanation(predicate);
LOG.warn(
- MessageFormat.format("Waiting timed out after [{0}] msec" + msg, adjustedTimeout));
+ MessageFormat.format("Waiting timed out after [{0}] msec", adjustedTimeout) + msg);
}
}
return (eval || interrupted) ? (System.currentTimeMillis() - started) : -1;