From 360a3c7d24aeec3caa1630d38bb90d3e3b412dc4 Mon Sep 17 00:00:00 2001 From: iosmanthus Date: Sat, 30 Jul 2022 19:22:59 +0800 Subject: [PATCH] fix potential NPE in region manager Signed-off-by: iosmanthus --- src/main/java/org/tikv/common/region/RegionManager.java | 2 -- src/test/java/org/tikv/common/TimeoutTest.java | 7 +++++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/tikv/common/region/RegionManager.java b/src/main/java/org/tikv/common/region/RegionManager.java index 8c1624e42e..7f21ca8d20 100644 --- a/src/main/java/org/tikv/common/region/RegionManager.java +++ b/src/main/java/org/tikv/common/region/RegionManager.java @@ -138,8 +138,6 @@ public class RegionManager { region = cache.putRegion(createRegion(regionAndLeader.first, regionAndLeader.second, backOffer)); } - } catch (Exception e) { - return null; } finally { requestTimer.observeDuration(); slowLogSpan.end(); diff --git a/src/test/java/org/tikv/common/TimeoutTest.java b/src/test/java/org/tikv/common/TimeoutTest.java index e0f3d01d1c..33642c2ccb 100644 --- a/src/test/java/org/tikv/common/TimeoutTest.java +++ b/src/test/java/org/tikv/common/TimeoutTest.java @@ -52,9 +52,12 @@ public class TimeoutTest extends MockThreeStoresTest { try (RawKVClient client = createClient()) { pdServers.get(0).stop(); long start = System.currentTimeMillis(); - client.get(ByteString.copyFromUtf8("key")); + try { + client.get(ByteString.copyFromUtf8("key")); + } catch (Exception ignore) { + } long end = System.currentTimeMillis(); - Assert.assertTrue(end - start < session.getConf().getRawKVReadTimeoutInMS() * 2L); + Assert.assertTrue(end - start < (session.getConf().getRawKVReadTimeoutInMS() * 1.5)); } } }