svn commit: r769977 - /maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/tag/AbstractTagCommand.java

[ol...@apache.org]

Author: olamy
Date: Wed Apr 29 22:43:57 2009
New Revision: 769977

URL: http://svn.apache.org/viewvc?rev=769977&view=rev
Log:
[SCM-460] tag command ignores custom message parameter


Modified:
    maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/tag/AbstractTagCommand.java

Modified: maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/tag/AbstractTagCommand.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/tag/AbstractTagCommand.java?rev=769977&r1=769976&r2=769977&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/tag/AbstractTagCommand.java (original)
+++ maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/tag/AbstractTagCommand.java Wed Apr 29 22:43:57 2009
@@ -57,20 +57,27 @@
         throws ScmException;    
     
     /** {@inheritDoc} */
-    public ScmResult executeCommand( ScmProviderRepository repository, ScmFileSet fileSet,
-                                     CommandParameters parameters )
+    public ScmResult executeCommand( ScmProviderRepository repository, ScmFileSet fileSet, CommandParameters parameters )
         throws ScmException
     {
         String tagName = parameters.getString( CommandParameter.TAG_NAME );
 
-        String message = parameters.getString( CommandParameter.MESSAGE, "[maven-scm] copy for tag " + tagName );
-
         ScmTagParameters scmTagParameters = parameters.getScmTagParameters( CommandParameter.SCM_TAG_PARAMETERS );
-        if (message != null)
+
+        String message = parameters.getString( CommandParameter.MESSAGE );
+
+        if ( message != null )
         {
+            // if message was passed by CommandParameter.MESSAGE then use it.
             scmTagParameters.setMessage( message );
         }
-        
+
+        if ( scmTagParameters.getMessage() == null )
+        {
+            // if message hasn't been passed nor by ScmTagParameters nor by CommandParameter.MESSAGE then use default.
+            scmTagParameters.setMessage( "[maven-scm] copy for tag " + tagName );
+        }
+
         return executeTagCommand( repository, fileSet, tagName, scmTagParameters );
     }