Repository: phoenix Updated Branches: refs/heads/4.3 66411e775 -> 50a6a9ac0
PHOENIX-1790 Fix test failures due to incorrect shadowing of @AfterClass methods. Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/50a6a9ac Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/50a6a9ac Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/50a6a9ac Branch: refs/heads/4.3 Commit: 50a6a9ac06d5b0642d2688213b96b78259c8d9fd Parents: 66411e7 Author: Samarth <[email protected]> Authored: Mon Mar 30 08:58:10 2015 -0700 Committer: Samarth <[email protected]> Committed: Mon Mar 30 08:58:10 2015 -0700 ---------------------------------------------------------------------- .../src/it/java/org/apache/phoenix/rpc/PhoenixClientRpcIT.java | 2 +- .../src/it/java/org/apache/phoenix/rpc/PhoenixServerRpcIT.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/50a6a9ac/phoenix-core/src/it/java/org/apache/phoenix/rpc/PhoenixClientRpcIT.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/rpc/PhoenixClientRpcIT.java b/phoenix-core/src/it/java/org/apache/phoenix/rpc/PhoenixClientRpcIT.java index eae890d..378b45e 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/rpc/PhoenixClientRpcIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/rpc/PhoenixClientRpcIT.java @@ -57,7 +57,7 @@ public class PhoenixClientRpcIT extends BaseOwnClusterHBaseManagedTimeIT { } @AfterClass - public static void doTeardown() throws Exception { + public static void cleanUpAfterTestSuite() throws Exception { TestPhoenixIndexRpcSchedulerFactory.reset(); } http://git-wip-us.apache.org/repos/asf/phoenix/blob/50a6a9ac/phoenix-core/src/it/java/org/apache/phoenix/rpc/PhoenixServerRpcIT.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/rpc/PhoenixServerRpcIT.java b/phoenix-core/src/it/java/org/apache/phoenix/rpc/PhoenixServerRpcIT.java index 796a439..1e9fdaf 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/rpc/PhoenixServerRpcIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/rpc/PhoenixServerRpcIT.java @@ -76,7 +76,7 @@ public class PhoenixServerRpcIT extends BaseOwnClusterHBaseManagedTimeIT { } @AfterClass - public static void doTeardown() throws Exception { + public static void cleanUpAfterTestSuite() throws Exception { TestPhoenixIndexRpcSchedulerFactory.reset(); }
