From 7a31b23d26605e942883c86c77ef6e3302b7802f Mon Sep 17 00:00:00 2001
From: Shikhar Bhushan <shikhar@schmizz.net>
Date: Sun, 7 Mar 2010 02:48:46 +0100
Subject: [PATCH] loadKnownHosts logic was kinda senseless

---
 src/main/java/net/schmizz/sshj/SSHClient.java | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/main/java/net/schmizz/sshj/SSHClient.java b/src/main/java/net/schmizz/sshj/SSHClient.java
index a3a9fe33..63ff8793 100644
--- a/src/main/java/net/schmizz/sshj/SSHClient.java
+++ b/src/main/java/net/schmizz/sshj/SSHClient.java
@@ -515,8 +515,12 @@ public class SSHClient
         final File sshDir = OpenSSHKnownHosts.detectSSHDir();
         if (sshDir != null) {
             for (File loc : Arrays.asList(new File(sshDir, "known_hosts"), new File(sshDir, "known_hosts2"))) {
-                loadKnownHosts(loc);
-                loaded = true;
+                try {
+                    loadKnownHosts(loc);
+                    loaded = true;
+                } catch (IOException e) {
+                    // Ignore for now
+                }
             }
         }
         if (!loaded)
@@ -570,7 +574,7 @@ public class SSHClient
      *         server
      */
     public X11Forwarder registerX11Forwarder(ConnectListener listener) {
-        X11Forwarder x11f = new X11Forwarder(conn, listener);
+        final X11Forwarder x11f = new X11Forwarder(conn, listener);
         conn.attach(x11f);
         return x11f;
     }
@@ -606,7 +610,7 @@ public class SSHClient
     public Session startSession()
             throws ConnectionException, TransportException {
         assert isConnected() && isAuthenticated();
-        SessionChannel sess = new SessionChannel(conn);
+        final SessionChannel sess = new SessionChannel(conn);
         sess.open();
         assert sess.isOpen();
         return sess;
@@ -650,7 +654,7 @@ public class SSHClient
             throws TransportException {
         assert trans.isRunning();
 
-        long start = System.currentTimeMillis();
+        final long start = System.currentTimeMillis();
 
         try {
             trans.doKex();