/*
 * Copyright 2013 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 *      http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */

package org.gradle.api.internal.externalresource.transport.sftp;

import org.apache.sshd.ClientSession;
import org.apache.sshd.client.sftp.DefaultSftpClient;
import org.apache.sshd.common.SshException;
import org.apache.sshd.common.util.Buffer;

import java.io.IOException;

public class NonExistingFileHandlingSftpClient extends DefaultSftpClient implements LockableSftpClient {

    private final ClientSession clientSession;
    private boolean locked;

    public NonExistingFileHandlingSftpClient(ClientSession clientSession) throws IOException {
        super(clientSession);
        this.clientSession = clientSession;
    }

    @Override
    protected Attributes checkAttributes(Buffer buffer) throws IOException {
        buffer.getInt(); //length
        int type = buffer.getByte();
        buffer.getInt(); //id
        if (type == SSH_FXP_STATUS) {
            int substatus = buffer.getInt();
            String msg = buffer.getString();
            buffer.getString(); //lang
            if (substatus == DefaultSftpClient.SSH_FX_NO_SUCH_FILE) {
                return null;
            } else {
                throw new SshException("SFTP error (" + substatus + "): " + msg);
            }
        } else if (type == SSH_FXP_ATTRS) {
            return readAttributes(buffer);
        } else {
            throw new SshException("Unexpected SFTP packet received: " + type);
        }
    }

    @Override
    public void close() throws IOException {
        super.close();
        clientSession.close(true);
    }

    public boolean isLocked() {
        return locked;
    }

    public void lock() {
        locked = true;
    }

    public void unlock() {
        locked = false;
    }
}

/*
 * Copyright 2013 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 *      http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */

package org.gradle.api.internal.externalresource.transport.sftp;

import org.apache.sshd.ClientSession;
import org.apache.sshd.client.sftp.DefaultSftpClient;
import org.apache.sshd.common.SshException;
import org.apache.sshd.common.util.Buffer;

import java.io.IOException;

public class NonExistingFileHandlingSftpClient extends DefaultSftpClient implements LockableSftpClient {

    private final ClientSession clientSession;
    private boolean locked;

    public NonExistingFileHandlingSftpClient(ClientSession clientSession) throws IOException {
        super(clientSession);
        this.clientSession = clientSession;
    }

    @Override
    protected Attributes checkAttributes(Buffer buffer) throws IOException {
        buffer.getInt(); //length
        int type = buffer.getByte();
        buffer.getInt(); //id
        if (type == SSH_FXP_STATUS) {
            int substatus = buffer.getInt();
            String msg = buffer.getString();
            buffer.getString(); //lang
            if (substatus == DefaultSftpClient.SSH_FX_NO_SUCH_FILE) {
                return null;
            } else {
                throw new SshException("SFTP error (" + substatus + "): " + msg);
            }
        } else if (type == SSH_FXP_ATTRS) {
            return readAttributes(buffer);
        } else {
            throw new SshException("Unexpected SFTP packet received: " + type);
        }
    }

    @Override
    public void close() throws IOException {
        super.close();
        clientSession.close(false).awaitUninterruptibly();
    }

    public boolean isLocked() {
        return locked;
    }

    public void lock() {
        locked = true;
    }

    public void unlock() {
        locked = false;
    }
}

Revert this change. This seems to be the more graceful way of closing client sessions.