You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ol...@apache.org on 2018/03/03 09:57:57 UTC
[1/2] maven-scm git commit: [SCM-863] fix NPE in
GlobalOptions.setCVSRoot(null) with newer cvsclient
Repository: maven-scm
Updated Branches:
refs/heads/master b03f727fc -> 9282d0ed1
[SCM-863] fix NPE in GlobalOptions.setCVSRoot(null) with newer cvsclient
http://hg.netbeans.org/releases/file/91d6c4c73bea/lib.cvsclient/src/org/netbeans/lib/cvsclient/command/GlobalOptions.java#l467
Project: http://git-wip-us.apache.org/repos/asf/maven-scm/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-scm/commit/fa78bbc6
Tree: http://git-wip-us.apache.org/repos/asf/maven-scm/tree/fa78bbc6
Diff: http://git-wip-us.apache.org/repos/asf/maven-scm/diff/fa78bbc6
Branch: refs/heads/master
Commit: fa78bbc6d4e93ecc218f245df24c3b674023a25c
Parents: 6f7dd0c
Author: Ilya Basin <ba...@gmail.com>
Authored: Tue Feb 13 17:24:30 2018 +0300
Committer: Ilya Basin <ba...@gmail.com>
Committed: Fri Feb 16 14:33:13 2018 +0300
----------------------------------------------------------------------
.../cvslib/cvsjava/util/CvsConnection.java | 19 +++++++++++--------
1 file changed, 11 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven-scm/blob/fa78bbc6/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvsjava/src/main/java/org/apache/maven/scm/provider/cvslib/cvsjava/util/CvsConnection.java
----------------------------------------------------------------------
diff --git a/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvsjava/src/main/java/org/apache/maven/scm/provider/cvslib/cvsjava/util/CvsConnection.java b/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvsjava/src/main/java/org/apache/maven/scm/provider/cvslib/cvsjava/util/CvsConnection.java
index 241e63a..53323aa 100644
--- a/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvsjava/src/main/java/org/apache/maven/scm/provider/cvslib/cvsjava/util/CvsConnection.java
+++ b/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvsjava/src/main/java/org/apache/maven/scm/provider/cvslib/cvsjava/util/CvsConnection.java
@@ -399,11 +399,7 @@ public class CvsConnection
public static boolean processCommand( String[] args, String localPath, CVSListener listener, ScmLogger logger )
throws Exception
{
- // Set up the CVSRoot. Note that it might still be null after this
- // call if the user has decided to set it with the -d command line
- // global option
GlobalOptions globalOptions = new GlobalOptions();
- globalOptions.setCVSRoot( getCVSRoot( localPath ) );
// Set up any global options specified. These occur before the
// name of the command to run
@@ -422,14 +418,21 @@ public class CvsConnection
return false;
}
- // if we don't have a CVS root by now, the user has messed up
+ // CVSRoot might still be null if the user has NOT decided to set
+ // it with the -d command line global option
if ( globalOptions.getCVSRoot() == null )
{
- if ( logger.isErrorEnabled() )
+ String cvsRoot = getCVSRoot( localPath );
+ if ( cvsRoot == null )
{
- logger.error( "No CVS root is set. Check your <repository> information in the POM." );
+ // if we don't have a CVS root by now, the user has messed up
+ if ( logger.isErrorEnabled() )
+ {
+ logger.error( "No CVS root is set. Check your <repository> information in the POM." );
+ }
+ return false;
}
- return false;
+ globalOptions.setCVSRoot( cvsRoot );
}
// parse the CVS root into its constituent parts
[2/2] maven-scm git commit: Merge branch 'pr-61'
Posted by ol...@apache.org.
Merge branch 'pr-61'
This closes #61
Project: http://git-wip-us.apache.org/repos/asf/maven-scm/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-scm/commit/9282d0ed
Tree: http://git-wip-us.apache.org/repos/asf/maven-scm/tree/9282d0ed
Diff: http://git-wip-us.apache.org/repos/asf/maven-scm/diff/9282d0ed
Branch: refs/heads/master
Commit: 9282d0ed1fa9cbafcb1c1c2d6f242e6632d2ef39
Parents: b03f727 fa78bbc
Author: olivier lamy <ol...@apache.org>
Authored: Sat Mar 3 19:57:21 2018 +1000
Committer: olivier lamy <ol...@apache.org>
Committed: Sat Mar 3 19:57:31 2018 +1000
----------------------------------------------------------------------
.../cvslib/cvsjava/util/CvsConnection.java | 19 +++++++++++--------
1 file changed, 11 insertions(+), 8 deletions(-)
----------------------------------------------------------------------