You are viewing a plain text version of this content. The canonical link for it is here.
Posted to wagon-commits@maven.apache.org by ca...@apache.org on 2007/04/12 23:20:31 UTC

svn commit: r528239 - /maven/wagon/branches/wagon-1.x/wagon-providers/wagon-ftp/src/main/java/org/apache/maven/wagon/providers/ftp/FtpWagon.java

Author: carlos
Date: Thu Apr 12 14:20:30 2007
New Revision: 528239

URL: http://svn.apache.org/viewvc?view=rev&rev=528239
Log:
[WAGONFTP-17] Show errors in case that username or password is not defined
merged rev# 528237 from trunk

Modified:
    maven/wagon/branches/wagon-1.x/wagon-providers/wagon-ftp/src/main/java/org/apache/maven/wagon/providers/ftp/FtpWagon.java

Modified: maven/wagon/branches/wagon-1.x/wagon-providers/wagon-ftp/src/main/java/org/apache/maven/wagon/providers/ftp/FtpWagon.java
URL: http://svn.apache.org/viewvc/maven/wagon/branches/wagon-1.x/wagon-providers/wagon-ftp/src/main/java/org/apache/maven/wagon/providers/ftp/FtpWagon.java?view=diff&rev=528239&r1=528238&r2=528239
==============================================================================
--- maven/wagon/branches/wagon-1.x/wagon-providers/wagon-ftp/src/main/java/org/apache/maven/wagon/providers/ftp/FtpWagon.java (original)
+++ maven/wagon/branches/wagon-1.x/wagon-providers/wagon-ftp/src/main/java/org/apache/maven/wagon/providers/ftp/FtpWagon.java Thu Apr 12 14:20:30 2007
@@ -80,6 +80,15 @@
 
         String password = authInfo.getPassword();
 
+        if ( username == null )
+        {
+            throw new AuthenticationException( "Username not specified for repository " + getRepository().getId() );
+        }
+        if ( password == null )
+        {
+            throw new AuthenticationException( "Password not specified for repository " + getRepository().getId() );
+        }
+
         String host = getRepository().getHost();
 
         ftp = new FTPClient();
@@ -140,7 +149,7 @@
 
         try
         {
-            if ( !ftp.login( username.trim(), password.trim() ) )
+            if ( !ftp.login( username, password ) )
             {
                 fireSessionConnectionRefused();
 



---------------------------------------------------------------------
To unsubscribe, e-mail: wagon-commits-unsubscribe@maven.apache.org
For additional commands, e-mail: wagon-commits-help@maven.apache.org