From b6dd2693cdda689d9391d501773873ee15cfdd17 Mon Sep 17 00:00:00 2001 From: hstyi Date: Sat, 15 Feb 2025 19:22:01 +0800 Subject: [PATCH] fix: hostConfigEntry NPE --- src/main/kotlin/app/termora/transport/Transport.kt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/main/kotlin/app/termora/transport/Transport.kt b/src/main/kotlin/app/termora/transport/Transport.kt index 9fa3963..d35ba27 100644 --- a/src/main/kotlin/app/termora/transport/Transport.kt +++ b/src/main/kotlin/app/termora/transport/Transport.kt @@ -2,6 +2,7 @@ package app.termora.transport import app.termora.Disposable import org.apache.commons.io.IOUtils +import org.apache.commons.lang3.ObjectUtils import org.apache.commons.net.io.CopyStreamEvent import org.apache.commons.net.io.CopyStreamListener import org.apache.commons.net.io.Util @@ -105,7 +106,10 @@ abstract class Transport( if (fileSystem is SftpFileSystem) { val clientSession = fileSystem.session if (clientSession is JGitClientSession) { - return clientSession.hostConfigEntry.host + return ObjectUtils.defaultIfNull( + clientSession.hostConfigEntry.host, + clientSession.hostConfigEntry.hostName + ) } } return "file"