You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by zh...@apache.org on 2017/12/22 13:45:15 UTC
[17/26] hbase git commit: HBASE-19593 Possible NPE if wal is closed
during waledit append.(Rajeshabbu)
HBASE-19593 Possible NPE if wal is closed during waledit append.(Rajeshabbu)
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/c0598dcb
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/c0598dcb
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/c0598dcb
Branch: refs/heads/HBASE-19397
Commit: c0598dcb10f2185164548ad8a1fdf1867d6a0b34
Parents: 448ba3a
Author: Rajeshbabu Chintaguntla <ra...@apache.org>
Authored: Fri Dec 22 17:20:45 2017 +0530
Committer: Rajeshbabu Chintaguntla <ra...@apache.org>
Committed: Fri Dec 22 17:20:45 2017 +0530
----------------------------------------------------------------------
.../main/java/org/apache/hadoop/hbase/regionserver/HRegion.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/c0598dcb/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
index bb01fe8..6401a8b 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
@@ -7585,7 +7585,7 @@ public class HRegion implements HeapSize, PropagatingConfigurationObserver, Regi
}
writeEntry = walKey.getWriteEntry();
} catch (IOException ioe) {
- if (walKey != null) {
+ if (walKey != null && walKey.getWriteEntry() != null) {
mvcc.complete(walKey.getWriteEntry());
}
throw ioe;