fix ssh bug

This commit is contained in:
Looly 2019-11-29 10:58:25 +08:00
parent da031ee61c
commit 6c62973048
3 changed files with 6 additions and 3 deletions

View File

@ -11,11 +11,13 @@
* 【extra】 邮件发送后获取message-idissue#I15FKR@Gitee
* 【core 】 CaseInsensitiveMap/CamelCaseMap增加toStringissue#636@Github
* 【core 】 XmlUtil多节点改进issue#I15I0R@Gitee
* 【core 】 Thread.excAsync修正为execAsyncissue#642@Github
### Bug修复
* 【extra】 修复SFTP.upload上传失败的问题issue#I15O40@Gitee
* 【db】 修复findLike匹配错误问题
* 【core 】 修复scale方法透明无效问题issue#I15L5S@Gitee
* 【extra】 修复exec返回无效issue#I15L5S@Gitee
-------------------------------------------------------------------------------------------------------------

View File

@ -101,7 +101,7 @@ public class ThreadUtil {
* @param isDaemon 是否守护线程守护线程会在主线程结束后自动结束
* @return 执行的方法体
*/
public static Runnable excAsync(final Runnable runnable, boolean isDaemon) {
public static Runnable execAsync(final Runnable runnable, boolean isDaemon) {
Thread thread = new Thread(runnable);
thread.setDaemon(isDaemon);
thread.start();
@ -432,6 +432,7 @@ public class ThreadUtil {
* @param obj 对象所在线程
* @since 4.5.6
*/
@SuppressWarnings("SynchronizationOnLocalVariableOrMethodParameter")
public static void sync(Object obj) {
synchronized (obj) {
try {

View File

@ -356,13 +356,13 @@ public class JschUtil {
if (null == charset) {
charset = CharsetUtil.CHARSET_UTF_8;
}
final ChannelExec channel = (ChannelExec) openChannel(session, ChannelType.EXEC);
final ChannelExec channel = (ChannelExec) createChannel(session, ChannelType.EXEC);
channel.setCommand(StrUtil.bytes(cmd, charset));
channel.setInputStream(null);
channel.setErrStream(errStream);
InputStream in = null;
try {
channel.start();
channel.connect();
in = channel.getInputStream();
return IoUtil.read(in, CharsetUtil.CHARSET_UTF_8);
} catch (IOException e) {