From 16dfcf315488832510a09dc5053892eca1795502 Mon Sep 17 00:00:00 2001 From: Looly Date: Fri, 10 Jun 2022 09:00:30 +0800 Subject: [PATCH] fix null --- .../src/main/java/cn/hutool/core/lang/SimpleCache.java | 2 +- .../src/main/java/cn/hutool/extra/ssh/JschSessionPool.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/SimpleCache.java b/hutool-core/src/main/java/cn/hutool/core/lang/SimpleCache.java index 5bef6a15f..332723c7b 100755 --- a/hutool-core/src/main/java/cn/hutool/core/lang/SimpleCache.java +++ b/hutool-core/src/main/java/cn/hutool/core/lang/SimpleCache.java @@ -96,7 +96,7 @@ public class SimpleCache implements Iterable>, Serializabl */ public V get(K key, Predicate validPredicate, Func0 supplier) { V v = get(key); - if((null != validPredicate && false == validPredicate.test(v))){ + if((null != validPredicate && null != v && false == validPredicate.test(v))){ v = null; } if (null == v && null != supplier) { diff --git a/hutool-extra/src/main/java/cn/hutool/extra/ssh/JschSessionPool.java b/hutool-extra/src/main/java/cn/hutool/extra/ssh/JschSessionPool.java index 28afa9e52..164b7824f 100755 --- a/hutool-extra/src/main/java/cn/hutool/extra/ssh/JschSessionPool.java +++ b/hutool-extra/src/main/java/cn/hutool/extra/ssh/JschSessionPool.java @@ -42,7 +42,7 @@ public enum JschSessionPool { */ public Session getSession(String sshHost, int sshPort, String sshUser, String sshPass) { final String key = StrUtil.format("{}@{}:{}", sshUser, sshHost, sshPort); - return this.cache.get(key, (conn)->null != conn && conn.isConnected(), ()-> JschUtil.openSession(sshHost, sshPort, sshUser, sshPass)); + return this.cache.get(key, Session::isConnected, ()-> JschUtil.openSession(sshHost, sshPort, sshUser, sshPass)); } /** @@ -57,7 +57,7 @@ public enum JschSessionPool { */ public Session getSession(String sshHost, int sshPort, String sshUser, String prvkey, byte[] passphrase) { final String key = StrUtil.format("{}@{}:{}", sshUser, sshHost, sshPort); - return this.cache.get(key, (conn)->null != conn && conn.isConnected(), ()->JschUtil.openSession(sshHost, sshPort, sshUser, prvkey, passphrase)); + return this.cache.get(key, Session::isConnected, ()->JschUtil.openSession(sshHost, sshPort, sshUser, prvkey, passphrase)); } /**