From 34d5d76e310113edf7ad1b454e18cfd6447da8fd Mon Sep 17 00:00:00 2001
From: birdstorm <samuelwyf@hotmail.com>
Date: Thu, 27 May 2021 17:06:40 +0900
Subject: [PATCH] cherry pick #172 to release-3.1

Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
---
 src/main/java/org/tikv/common/exception/RegionException.java | 2 +-
 src/main/java/org/tikv/common/operation/KVErrorHandler.java  | 4 +---
 src/main/java/org/tikv/common/util/Batch.java                | 2 +-
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/main/java/org/tikv/common/exception/RegionException.java b/src/main/java/org/tikv/common/exception/RegionException.java
index d94b4105198..3a8dd97737f 100644
--- a/src/main/java/org/tikv/common/exception/RegionException.java
+++ b/src/main/java/org/tikv/common/exception/RegionException.java
@@ -24,7 +24,7 @@ public class RegionException extends TiKVException {
   private final Error regionErr;
 
   public RegionException(Error regionErr) {
-    super("Region Exception occurred" + regionErr.getMessage());
+    super("Region Exception occurred " + regionErr.getMessage());
     this.regionErr = regionErr;
   }
 
diff --git a/src/main/java/org/tikv/common/operation/KVErrorHandler.java b/src/main/java/org/tikv/common/operation/KVErrorHandler.java
index 35631e3dbc4..55bbdef44ee 100644
--- a/src/main/java/org/tikv/common/operation/KVErrorHandler.java
+++ b/src/main/java/org/tikv/common/operation/KVErrorHandler.java
@@ -123,9 +123,7 @@ private void resolveLock(BackOffer backOffer, Lock lock) {
   @Override
   public boolean handleResponseError(BackOffer backOffer, RespT resp) {
     if (resp == null) {
-      String msg =
-          String.format(
-              "Request Failed with unknown reason for region region [%s]", recv.getRegion());
+      String msg = String.format("Request Failed with unknown reason for [%s]", recv.getRegion());
       logger.warn(msg);
       return handleRequestError(backOffer, new GrpcException(msg));
     }
diff --git a/src/main/java/org/tikv/common/util/Batch.java b/src/main/java/org/tikv/common/util/Batch.java
index 5f8e63886ef..2c9f161bf34 100644
--- a/src/main/java/org/tikv/common/util/Batch.java
+++ b/src/main/java/org/tikv/common/util/Batch.java
@@ -56,7 +56,7 @@ private Map<ByteString, ByteString> toMap(List<ByteString> keys, List<ByteString
   }
 
   public BackOffer getBackOffer() {
-    return backOffer;
+    return ConcreteBackOffer.create(backOffer);
   }
 
   public TiRegion getRegion() {