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/ede20aa2 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/ede20aa2 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/ede20aa2 Branch: refs/heads/hbase-11339 Commit: ede20aa2880ce509e6d3df67818ad305ca9f4eb8 Parents: a3f495f Author: tedyu <[email protected]> Authored: Tue Feb 10 09:43:31 2015 -0800 Committer: tedyu <[email protected]> Committed: Tue Feb 10 09:43:31 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/ede20aa2/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 1110f20..cd31ce5 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); 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;
