From f7f425e53ed4b6feb63b88aa6f02f2836607e10c Mon Sep 17 00:00:00 2001
From: tedyu <yuzhihong@gmail.com>
Date: Mon, 27 Nov 2017 11:41:46 -0800
Subject: [PATCH] HBASE-19300 TestMultithreadedTableMapper fails in branch-1.4

---
 .../hadoop/hbase/mapreduce/MultithreadedTableMapper.java      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/MultithreadedTableMapper.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/MultithreadedTableMapper.java
index ca5ef01de89..0b377abdb1b 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/MultithreadedTableMapper.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/MultithreadedTableMapper.java
@@ -166,7 +166,7 @@ public class MultithreadedTableMapper<K2, V2> extends TableMapper<K2, V2> {
 
     @Override
     public boolean nextKeyValue() throws IOException, InterruptedException {
-      synchronized (this) {
+      synchronized (outer) {
         if (!outer.nextKeyValue()) {
           return false;
         }
@@ -198,7 +198,7 @@ public class MultithreadedTableMapper<K2, V2> extends TableMapper<K2, V2> {
     @Override
     public void write(K2 key, V2 value) throws IOException,
     InterruptedException {
-      synchronized (this) {
+      synchronized (outer) {
         outer.write(key, value);
       }
     }