You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@phoenix.apache.org by je...@apache.org on 2014/10/20 06:34:34 UTC
git commit: PHOENIX-1360: NPE in SpoolingResultIterator
Repository: phoenix
Updated Branches:
refs/heads/3.0 517798713 -> d9e58958a
PHOENIX-1360: NPE in SpoolingResultIterator
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/d9e58958
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/d9e58958
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/d9e58958
Branch: refs/heads/3.0
Commit: d9e58958a14fbcbb08d4db7450d35b427c990321
Parents: 5177987
Author: Jeffrey Zhong <je...@apache.org>
Authored: Sun Oct 19 21:34:23 2014 -0700
Committer: Jeffrey Zhong <je...@apache.org>
Committed: Sun Oct 19 21:35:15 2014 -0700
----------------------------------------------------------------------
.../java/org/apache/phoenix/iterate/SpoolingResultIterator.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/phoenix/blob/d9e58958/phoenix-core/src/main/java/org/apache/phoenix/iterate/SpoolingResultIterator.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/main/java/org/apache/phoenix/iterate/SpoolingResultIterator.java b/phoenix-core/src/main/java/org/apache/phoenix/iterate/SpoolingResultIterator.java
index f35999e..caa7579 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/iterate/SpoolingResultIterator.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/iterate/SpoolingResultIterator.java
@@ -132,7 +132,7 @@ public class SpoolingResultIterator implements PeekingResultIterator {
scanner.close();
} finally {
try {
- if (!usedOnDiskIterator) {
+ if (!usedOnDiskIterator && tempFile != null) {
tempFile.delete();
}
} finally {