Return-Path: Delivered-To: apmail-commons-commits-archive@minotaur.apache.org Received: (qmail 80736 invoked from network); 10 Nov 2010 18:09:32 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 10 Nov 2010 18:09:32 -0000 Received: (qmail 81396 invoked by uid 500); 10 Nov 2010 18:10:03 -0000 Delivered-To: apmail-commons-commits-archive@commons.apache.org Received: (qmail 81349 invoked by uid 500); 10 Nov 2010 18:10:03 -0000 Mailing-List: contact commits-help@commons.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@commons.apache.org Delivered-To: mailing list commits@commons.apache.org Received: (qmail 81341 invoked by uid 99); 10 Nov 2010 18:10:03 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 10 Nov 2010 18:10:03 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 10 Nov 2010 18:10:00 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 35BCD23889ED; Wed, 10 Nov 2010 18:08:46 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1033623 - /commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/provider/sftp/SftpClientFactory.java Date: Wed, 10 Nov 2010 18:08:46 -0000 To: commits@commons.apache.org From: sebb@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20101110180846.35BCD23889ED@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: sebb Date: Wed Nov 10 18:08:45 2010 New Revision: 1033623 URL: http://svn.apache.org/viewvc?rev=1033623&view=rev Log: Cannot be null here Modified: commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/provider/sftp/SftpClientFactory.java Modified: commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/provider/sftp/SftpClientFactory.java URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/provider/sftp/SftpClientFactory.java?rev=1033623&r1=1033622&r2=1033623&view=diff ============================================================================== --- commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/provider/sftp/SftpClientFactory.java (original) +++ commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs/provider/sftp/SftpClientFactory.java Wed Nov 10 18:08:45 2010 @@ -79,10 +79,7 @@ public final class SftpClientFactory } else { - if (sshDir == null) - { - sshDir = findSshDir(); - } + sshDir = findSshDir(); // Load the known hosts file knownHostsFile = new File(sshDir, "known_hosts"); if (knownHostsFile.isFile() && knownHostsFile.canRead())