mirror of
https://github.com/hierynomus/sshj.git
synced 2025-12-06 23:30:55 +03:00
In SCP, warning means error...
This commit is contained in:
@@ -123,9 +123,6 @@ public final class SCPDownloadClient
|
||||
return true;
|
||||
|
||||
case (char) 1:
|
||||
addWarning(msg.substring(1));
|
||||
break;
|
||||
|
||||
case (char) 2:
|
||||
throw new SCPException("Remote SCP command returned error: " + msg.substring(1));
|
||||
|
||||
|
||||
@@ -61,7 +61,6 @@ abstract class SCPEngine {
|
||||
|
||||
final SessionFactory host;
|
||||
final TransferListener listener;
|
||||
final Queue<String> warnings = new LinkedList<String>();
|
||||
|
||||
Command scp;
|
||||
int exitStatus;
|
||||
@@ -86,19 +85,6 @@ abstract class SCPEngine {
|
||||
return exitStatus;
|
||||
}
|
||||
|
||||
public Queue<String> getWarnings() {
|
||||
return warnings;
|
||||
}
|
||||
|
||||
public boolean hadWarnings() {
|
||||
return !warnings.isEmpty();
|
||||
}
|
||||
|
||||
void addWarning(String warning) {
|
||||
log.warn(warning);
|
||||
warnings.add(warning);
|
||||
}
|
||||
|
||||
void check(String what)
|
||||
throws IOException {
|
||||
int code = scp.getInputStream().read();
|
||||
@@ -111,9 +97,7 @@ abstract class SCPEngine {
|
||||
case 0: // OK
|
||||
log.debug(what);
|
||||
return;
|
||||
case 1:
|
||||
addWarning(readMessage());
|
||||
break;
|
||||
case 1: // Warning? not
|
||||
case 2:
|
||||
throw new SCPException("Remote SCP command had error: " + readMessage());
|
||||
default:
|
||||
@@ -123,7 +107,6 @@ abstract class SCPEngine {
|
||||
|
||||
void cleanSlate() {
|
||||
exitStatus = -1;
|
||||
warnings.clear();
|
||||
}
|
||||
|
||||
void execSCPWith(List<Arg> args, String path)
|
||||
|
||||
Reference in New Issue
Block a user