Repository: phoenix Updated Branches: refs/heads/omid2 e9cd0a420 -> 77a7c2c30
PHOENIX-4975 Addendum to fix NPE Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/77a7c2c3 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/77a7c2c3 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/77a7c2c3 Branch: refs/heads/omid2 Commit: 77a7c2c306682ae13499a5797a82ebc94cfa453b Parents: e9cd0a4 Author: James Taylor <jamestay...@apache.org> Authored: Tue Oct 16 14:00:54 2018 -0700 Committer: James Taylor <jamestay...@apache.org> Committed: Tue Oct 16 14:00:54 2018 -0700 ---------------------------------------------------------------------- .../src/it/java/org/apache/phoenix/end2end/IndexToolIT.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/77a7c2c3/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexToolIT.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexToolIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexToolIT.java index c53cd7c..b0c151d 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexToolIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexToolIT.java @@ -116,9 +116,10 @@ public class IndexToolIT extends ParallelStatsEnabledIT { for (String transactionProvider : new String[] {"TEPHRA", "OMID", null}) { for (boolean mutable : Booleans) { for (boolean localIndex : Booleans) { - if (!TransactionFactory.getTransactionProvider( - TransactionFactory.Provider.valueOf(transactionProvider)) - .isUnsupported(Feature.ALLOW_LOCAL_INDEX)) { + if (transactionProvider == null + || !TransactionFactory.getTransactionProvider( + TransactionFactory.Provider.valueOf(transactionProvider)) + .isUnsupported(Feature.ALLOW_LOCAL_INDEX)) { for (boolean directApi : Booleans) { for (boolean useSnapshot : Booleans) { list.add(new Object[] { transactionProvider, mutable, localIndex, directApi, useSnapshot });
