Index: hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/WALEditsReplaySink.java =================================================================== --- hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/WALEditsReplaySink.java (revision 1546887) +++ hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/WALEditsReplaySink.java (working copy) @@ -120,8 +120,9 @@ long startTime = EnvironmentEdgeManager.currentTimeMillis(); // replaying edits by region - for (HRegionInfo curRegion : entriesByRegion.keySet()) { - List allActions = entriesByRegion.get(curRegion); + for (Map.Entry> _entry : entriesByRegion.entrySet()) { + HRegionInfo curRegion = _entry.getKey(); + List allActions = _entry.getValue(); // send edits in chunks int totalActions = allActions.size(); int replayedActions = 0; Index: hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java =================================================================== --- hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java (revision 1546887) +++ hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java (working copy) @@ -5888,7 +5888,7 @@ * One thread may acquire multiple locks on the same row simultaneously. * The locks must be released by calling release() from the same thread. */ - public class RowLock { + public static class RowLock { @VisibleForTesting final RowLockContext context; private boolean released = false;