more retryable sshj exceptions

drivers/sshj/src/main/java/org/jclouds/sshj/SshjSshClient.java

@@ -31,6 +31,7 @@ import static org.jclouds.crypto.SshKeys.sha1PrivateKey;
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.ConnectException;
+import java.net.SocketTimeoutException;
 import java.util.concurrent.TimeUnit;
 
 import javax.annotation.PostConstruct;
@@ -118,7 +119,8 @@ public class SshjSshClient implements SshClient {
    @Named("jclouds.ssh.retry-predicate")
    // NOTE cannot retry io exceptions, as SSHException is a part of the chain
    private Predicate<Throwable> retryPredicate = or(instanceOf(ConnectionException.class),
-            instanceOf(ConnectException.class), instanceOf(TransportException.class));
+            instanceOf(ConnectException.class), instanceOf(SocketTimeoutException.class),
+            instanceOf(TransportException.class));
 
    @Resource
    @Named("jclouds.ssh")

drivers/sshj/src/test/java/org/jclouds/sshj/SshjSshClientTest.java

@@ -22,6 +22,7 @@ import static com.google.inject.name.Names.bindProperties;
 
 import java.io.IOException;
 import java.net.ConnectException;
+import java.net.SocketTimeoutException;
 import java.util.Properties;
 
 import net.schmizz.sshj.common.SSHException;
@@ -86,6 +87,7 @@ public class SshjSshClientTest {
    }
 
    public void testExceptionClassesRetry() {
+      assert ssh.shouldRetry(new SocketTimeoutException("connect timed out"));
       assert ssh.shouldRetry(new TransportException("socket closed"));
       assert ssh.shouldRetry(new ConnectionException("problem"));
       assert ssh.shouldRetry(new ConnectException("Connection refused"));