asfgit closed pull request #84: sonar: fix possible NPE, same fix of svn/git
provider
URL: https://github.com/apache/maven-scm/pull/84
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git
a/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/BazaarScmProvider.java
b/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/BazaarScmProvider.java
index a4fe1e499..e24ceb62a 100644
---
a/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/BazaarScmProvider.java
+++
b/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/BazaarScmProvider.java
@@ -81,7 +81,12 @@ public ScmProviderRepository makeProviderScmRepository(
String scmSpecificUrl, c
public ScmProviderRepository makeProviderScmRepository( File path )
throws ScmRepositoryException, UnknownRepositoryStructure
{
- if ( path == null || !path.isDirectory() )
+ if ( path == null )
+ {
+ throw new NullPointerException( "Path argument is null" );
+ }
+
+ if ( !path.isDirectory() )
{
throw new ScmRepositoryException( path.getAbsolutePath() + " isn't
a valid directory." );
}
diff --git
a/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/HgScmProvider.java
b/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/HgScmProvider.java
index 02a36aaf2..e38d3b443 100644
---
a/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/HgScmProvider.java
+++
b/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/HgScmProvider.java
@@ -159,7 +159,12 @@ else if ( url.startsWith( "http" ) )
public ScmProviderRepository makeProviderScmRepository( File path )
throws ScmRepositoryException, UnknownRepositoryStructure
{
- if ( path == null || !path.isDirectory() )
+ if ( path == null )
+ {
+ throw new NullPointerException( "Path argument is null" );
+ }
+
+ if ( !path.isDirectory() )
{
throw new ScmRepositoryException( path.getAbsolutePath() + " isn't
a valid directory." );
}
diff --git
a/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/AbstractCvsScmProvider.java
b/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/AbstractCvsScmProvider.java
index 05db3c8c2..9dc19502d 100644
---
a/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/AbstractCvsScmProvider.java
+++
b/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/AbstractCvsScmProvider.java
@@ -199,7 +199,12 @@ public ScmProviderRepository makeProviderScmRepository(
String scmSpecificUrl, c
public ScmProviderRepository makeProviderScmRepository( File path )
throws ScmRepositoryException, UnknownRepositoryStructure
{
- if ( path == null || !path.isDirectory() )
+ if ( path == null )
+ {
+ throw new NullPointerException( "Path argument is null" );
+ }
+
+ if ( !path.isDirectory() )
{
throw new ScmRepositoryException( path.getAbsolutePath() + " isn't
a valid directory." );
}
diff --git
a/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/tag/SvnTagCommand.java
b/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/tag/SvnTagCommand.java
index e2f26268e..b3f6005b5 100644
---
a/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/tag/SvnTagCommand.java
+++
b/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/tag/SvnTagCommand.java
@@ -103,8 +103,7 @@ public ScmResult executeTagCommand( ScmProviderRepository
repo, ScmFileSet fileS
try
{
- FileUtils.fileWrite( messageFile.getAbsolutePath(),
scmTagParameters == null ? "" : scmTagParameters
- .getMessage() );
+ FileUtils.fileWrite( messageFile.getAbsolutePath(),
scmTagParameters.getMessage() );
}
catch ( IOException ex )
{
@@ -164,7 +163,6 @@ public ScmResult executeTagCommand( ScmProviderRepository
repo, ScmFileSet fileS
{
if ( StringUtils.isNotEmpty( fileSet.getExcludes() ) )
{
- @SuppressWarnings( "unchecked" )
List<File> list =
FileUtils.getFiles( fileSet.getBasedir(),
( StringUtils.isEmpty(
fileSet.getIncludes() ) ? "**"
@@ -174,7 +172,6 @@ public ScmResult executeTagCommand( ScmProviderRepository
repo, ScmFileSet fileS
}
else
{
- @SuppressWarnings( "unchecked" )
List<File> list =
FileUtils.getFiles( fileSet.getBasedir(),
( StringUtils.isEmpty(
fileSet.getIncludes() ) ? "**"
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
