Repository: phoenix Updated Branches: refs/heads/4.x-HBase-0.98 581bd8917 -> a6301c198
PHOENIX-3036 Addendum to restore failsafe version to 2.19.1 Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/a6301c19 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/a6301c19 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/a6301c19 Branch: refs/heads/4.x-HBase-0.98 Commit: a6301c198bd71cb76b3805b43b50ecf1ee29c69d Parents: 581bd89 Author: Samarth <[email protected]> Authored: Sun Aug 28 22:07:34 2016 -0700 Committer: Samarth <[email protected]> Committed: Sun Aug 28 22:07:34 2016 -0700 ---------------------------------------------------------------------- .../java/org/apache/phoenix/query/BaseTest.java | 22 +++++++++++--------- pom.xml | 4 ++-- 2 files changed, 14 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/a6301c19/phoenix-core/src/test/java/org/apache/phoenix/query/BaseTest.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/test/java/org/apache/phoenix/query/BaseTest.java b/phoenix-core/src/test/java/org/apache/phoenix/query/BaseTest.java index c356502..62a4fa7 100644 --- a/phoenix-core/src/test/java/org/apache/phoenix/query/BaseTest.java +++ b/phoenix-core/src/test/java/org/apache/phoenix/query/BaseTest.java @@ -534,16 +534,18 @@ public abstract class BaseTest { } private static void deleteSnapshotFiles() throws IOException { - String path = config.get(TxConstants.Manager.CFG_TX_SNAPSHOT_DIR); - File dir = new File(path); - if (dir.exists()) { - for (File file : dir.listFiles()) { - if (!file.isDirectory()) { - file.delete(); - } - } - } - dir.delete(); + String path = config.get(TxConstants.Manager.CFG_TX_SNAPSHOT_DIR); + if (path != null) { + File dir = new File(path); + if (dir.exists()) { + for (File file : dir.listFiles()) { + if (!file.isDirectory()) { + file.delete(); + } + } + } + dir.delete(); + } } protected static void setupTxManager() throws SQLException, IOException { http://git-wip-us.apache.org/repos/asf/phoenix/blob/a6301c19/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index fab5220..2b3c997 100644 --- a/pom.xml +++ b/pom.xml @@ -110,8 +110,8 @@ <!-- Plugin versions --> <maven-eclipse-plugin.version>2.9</maven-eclipse-plugin.version> <maven-build-helper-plugin.version>1.9.1</maven-build-helper-plugin.version> - <maven-surefire-plugin.version>2.18.1</maven-surefire-plugin.version> - <maven-failsafe-plugin.version>2.18.1</maven-failsafe-plugin.version> + <maven-surefire-plugin.version>2.19.1</maven-surefire-plugin.version> + <maven-failsafe-plugin.version>2.19.1</maven-failsafe-plugin.version> <maven-dependency-plugin.version>2.1</maven-dependency-plugin.version> <maven.assembly.version>2.5.2</maven.assembly.version>
