svn commit: r613795 - in /ant/ivy/core/trunk: CHANGES.txt src/java/org/apache/ivy/plugins/repository/ssh/SshCache.java

[xavier]

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);