Return-Path: Delivered-To: apmail-ant-notifications-archive@locus.apache.org Received: (qmail 95752 invoked from network); 21 Jan 2008 08:39:07 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 21 Jan 2008 08:39:07 -0000 Received: (qmail 76646 invoked by uid 500); 21 Jan 2008 08:38:57 -0000 Delivered-To: apmail-ant-notifications-archive@ant.apache.org Received: (qmail 76634 invoked by uid 500); 21 Jan 2008 08:38:57 -0000 Mailing-List: contact notifications-help@ant.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ant.apache.org Delivered-To: mailing list notifications@ant.apache.org Received: (qmail 76625 invoked by uid 99); 21 Jan 2008 08:38:57 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 21 Jan 2008 00:38:57 -0800 X-ASF-Spam-Status: No, hits=-100.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 21 Jan 2008 08:38:52 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id A54E91A9832; Mon, 21 Jan 2008 00:38:44 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: svn commit: r613795 - in /ant/ivy/core/trunk: CHANGES.txt src/java/org/apache/ivy/plugins/repository/ssh/SshCache.java Date: Mon, 21 Jan 2008 08:38:44 -0000 To: notifications@ant.apache.org From: xavier@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080121083844.A54E91A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: xavier Date: Mon Jan 21 00:38:41 2008 New Revision: 613795 URL: http://svn.apache.org/viewvc?rev=613795&view=rev Log: FIX: NPE in SshCache during publish with ssh resolver without passFile (IVY-709) (thanks to Ruslan Shevchenko) Modified: ant/ivy/core/trunk/CHANGES.txt ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/repository/ssh/SshCache.java Modified: ant/ivy/core/trunk/CHANGES.txt URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/CHANGES.txt?rev=613795&r1=613794&r2=613795&view=diff ============================================================================== --- ant/ivy/core/trunk/CHANGES.txt (original) +++ ant/ivy/core/trunk/CHANGES.txt Mon Jan 21 00:38:41 2008 @@ -51,6 +51,7 @@ Geoff Reedy Christian Riege Andreas Sahlbach + Ruslan Shevchenko John Shields Johan Stuyts Jason Trump @@ -74,6 +75,7 @@ - IMPROVEMENT: Downgrade Ant version requirement to 1.6 to build Ivy (IVY-687) - IMPROVEMENT: In the ResolveReport class, add the possibility to filter the evicted module while getting the list of DownloadArtifact (IVY-704) (thanks to Nicolas Lalevée) +- FIX: NPE in SshCache during publish with ssh resolver without passFile (IVY-709) (thanks to Ruslan Shevchenko) - FIX: Update install ivy build file example (IVY-705) (thanks to Benjamin Francisoud) - FIX: Ivy swallows ParseException when using a latest strategy requiring module descriptors (IVY-702) (thanks to Nicolas Lalevée) - FIX: Problem with cached Ivy files which have extra attributes (IVY-693) Modified: ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/repository/ssh/SshCache.java URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/repository/ssh/SshCache.java?rev=613795&r1=613794&r2=613795&view=diff ============================================================================== --- ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/repository/ssh/SshCache.java (original) +++ ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/repository/ssh/SshCache.java Mon Jan 21 00:38:41 2008 @@ -327,8 +327,10 @@ Message.verbose(":: SSH :: connected to " + host + "!"); setSession(username, host, port, session); } catch (JSchException e) { - if (passFile.exists()) { + if (passFile!=null) { + if (passFile.exists()) { passFile.delete(); + } } IOException ex = new IOException(e.getMessage()); ex.initCause(e);