You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by mi...@apache.org on 2016/12/20 12:45:54 UTC
maven-wagon git commit: [WAGON-473] Don't abuse
IllegalArgumentException to intercept null input
Repository: maven-wagon
Updated Branches:
refs/heads/master 77f2cd3ee -> 30631655e
[WAGON-473] Don't abuse IllegalArgumentException to intercept null input
Project: http://git-wip-us.apache.org/repos/asf/maven-wagon/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-wagon/commit/30631655
Tree: http://git-wip-us.apache.org/repos/asf/maven-wagon/tree/30631655
Diff: http://git-wip-us.apache.org/repos/asf/maven-wagon/diff/30631655
Branch: refs/heads/master
Commit: 30631655e8f6cdf121161b3ca09e3da0134a5198
Parents: 77f2cd3
Author: Michael Osipov <mi...@apache.org>
Authored: Tue Dec 20 13:44:39 2016 +0100
Committer: Michael Osipov <mi...@apache.org>
Committed: Tue Dec 20 13:44:39 2016 +0100
----------------------------------------------------------------------
.../main/java/org/apache/maven/wagon/AbstractWagon.java | 2 +-
.../org/apache/maven/wagon/repository/Repository.java | 6 +++---
.../org/apache/maven/wagon/providers/ftp/FtpWagon.java | 4 ++--
.../wagon/providers/http/AbstractHttpClientWagon.java | 10 +++++-----
4 files changed, 11 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/30631655/wagon-provider-api/src/main/java/org/apache/maven/wagon/AbstractWagon.java
----------------------------------------------------------------------
diff --git a/wagon-provider-api/src/main/java/org/apache/maven/wagon/AbstractWagon.java b/wagon-provider-api/src/main/java/org/apache/maven/wagon/AbstractWagon.java
index 9497260..4cbf37d 100644
--- a/wagon-provider-api/src/main/java/org/apache/maven/wagon/AbstractWagon.java
+++ b/wagon-provider-api/src/main/java/org/apache/maven/wagon/AbstractWagon.java
@@ -178,7 +178,7 @@ public abstract class AbstractWagon
{
if ( repository == null )
{
- throw new IllegalStateException( "The repository specified cannot be null." );
+ throw new NullPointerException( "repository cannot be null" );
}
if ( permissionsOverride != null )
http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/30631655/wagon-provider-api/src/main/java/org/apache/maven/wagon/repository/Repository.java
----------------------------------------------------------------------
diff --git a/wagon-provider-api/src/main/java/org/apache/maven/wagon/repository/Repository.java b/wagon-provider-api/src/main/java/org/apache/maven/wagon/repository/Repository.java
index b28dd1a..456115a 100644
--- a/wagon-provider-api/src/main/java/org/apache/maven/wagon/repository/Repository.java
+++ b/wagon-provider-api/src/main/java/org/apache/maven/wagon/repository/Repository.java
@@ -78,14 +78,14 @@ public class Repository
{
if ( id == null )
{
- throw new NullPointerException( "id can not be null for Repository with url=" + url );
+ throw new NullPointerException( "id cannot be null" );
}
setId( id );
if ( url == null )
{
- throw new NullPointerException( "url can not be null for Repository with id=" + id );
+ throw new NullPointerException( "url cannot be null" );
}
setUrl( url );
@@ -207,7 +207,7 @@ public class Repository
/**
* Checks whtther provided url contains IPv6 format in host portion
- *
+ *
* @return true if provide host part is of IPv6 format
*/
private boolean isIPv6Address()
http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/30631655/wagon-providers/wagon-ftp/src/main/java/org/apache/maven/wagon/providers/ftp/FtpWagon.java
----------------------------------------------------------------------
diff --git a/wagon-providers/wagon-ftp/src/main/java/org/apache/maven/wagon/providers/ftp/FtpWagon.java b/wagon-providers/wagon-ftp/src/main/java/org/apache/maven/wagon/providers/ftp/FtpWagon.java
index 4fa0fd6..13c1f51 100644
--- a/wagon-providers/wagon-ftp/src/main/java/org/apache/maven/wagon/providers/ftp/FtpWagon.java
+++ b/wagon-providers/wagon-ftp/src/main/java/org/apache/maven/wagon/providers/ftp/FtpWagon.java
@@ -89,7 +89,7 @@ public class FtpWagon
if ( authInfo == null )
{
- throw new IllegalArgumentException( "Authentication Credentials cannot be null for FTP protocol" );
+ throw new NullPointerException("authenticationInfo cannot be null");
}
if ( authInfo.getUserName() == null )
@@ -409,7 +409,7 @@ public class FtpWagon
}
/**
- *
+ *
*/
public class PrintCommandListener
implements ProtocolCommandListener
http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/30631655/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/AbstractHttpClientWagon.java
----------------------------------------------------------------------
diff --git a/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/AbstractHttpClientWagon.java b/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/AbstractHttpClientWagon.java
index 49e69cc..9eafb72 100755
--- a/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/AbstractHttpClientWagon.java
+++ b/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/AbstractHttpClientWagon.java
@@ -169,12 +169,12 @@ public abstract class AbstractHttpClientWagon
return true;
}
- public void writeTo( final OutputStream outstream )
+ public void writeTo( final OutputStream outputStream )
throws IOException
{
- if ( outstream == null )
+ if ( outputStream == null )
{
- throw new IllegalArgumentException( "Output stream may not be null" );
+ throw new NullPointerException("outputStream cannot be null");
}
TransferEvent transferEvent =
new TransferEvent( wagon, resource, TransferEvent.TRANSFER_PROGRESS, TransferEvent.REQUEST_PUT );
@@ -192,7 +192,7 @@ public abstract class AbstractHttpClientWagon
while ( ( l = instream.read( buffer ) ) != -1 )
{
fireTransferProgress( transferEvent, buffer, -1 );
- outstream.write( buffer, 0, l );
+ outputStream.write( buffer, 0, l );
}
}
else
@@ -207,7 +207,7 @@ public abstract class AbstractHttpClientWagon
break;
}
fireTransferProgress( transferEvent, buffer, (int) Math.min( BUFFER_SIZE, remaining ) );
- outstream.write( buffer, 0, l );
+ outputStream.write( buffer, 0, l );
remaining -= l;
}
}