PHOENIX-1449 Fix potential NPE in delete
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/2311a3a1 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/2311a3a1 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/2311a3a1 Branch: refs/heads/3.2 Commit: 2311a3a18dec8213b68a713c53688cd27e3f6ae8 Parents: 8875c86 Author: James Taylor <jtay...@salesforce.com> Authored: Wed Nov 12 21:12:36 2014 -0800 Committer: James Taylor <jtay...@salesforce.com> Committed: Wed Nov 12 23:05:15 2014 -0800 ---------------------------------------------------------------------- .../src/main/java/org/apache/phoenix/compile/DeleteCompiler.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/2311a3a1/phoenix-core/src/main/java/org/apache/phoenix/compile/DeleteCompiler.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/compile/DeleteCompiler.java b/phoenix-core/src/main/java/org/apache/phoenix/compile/DeleteCompiler.java index 8af0e15..9bdba83 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/compile/DeleteCompiler.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/compile/DeleteCompiler.java @@ -166,7 +166,9 @@ public class DeleteCompiler { } connection.commit(); mutations.clear(); - indexMutations.clear(); + if (indexMutations != null) { + indexMutations.clear(); + } } }