svn commit: r517196 - in /maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/update: AbstractUpdateCommand.java UpdateScmResult.java

[evenisse]

Author: evenisse
Date: Mon Mar 12 06:04:31 2007
New Revision: 517196

URL: http://svn.apache.org/viewvc?view=rev&rev=517196
Log:
[SCM-259] Skip changelog command after update if maven-scm.update.skipChangelog 
property is true

Modified:
    
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/update/AbstractUpdateCommand.java
    
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/update/UpdateScmResult.java

Modified: 
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/update/AbstractUpdateCommand.java
URL: 
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/update/AbstractUpdateCommand.java?view=diff&rev=517196&r1=517195&r2=517196
==============================================================================
--- 
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/update/AbstractUpdateCommand.java
 (original)
+++ 
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/update/AbstractUpdateCommand.java
 Mon Mar 12 06:04:31 2007
@@ -59,6 +59,11 @@
 
         List filesList = updateScmResult.getUpdatedFiles();
 
+        if ( System.getProperty( "maven.scm.update.skipChangelog" ).equals( 
true ) )
+        {
+            return updateScmResult;
+        }
+
         ChangeLogCommand changeLogCmd = getChangeLogCommand();
 
         if ( filesList != null && filesList.size() > 0 && changeLogCmd != null 
)
@@ -110,10 +115,6 @@
             }
 
             updateScmResult.setChanges( changes );
-        }
-        else
-        {
-            updateScmResult.setChanges( new ArrayList() );
         }
 
         return updateScmResult;

Modified: 
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/update/UpdateScmResult.java
URL: 
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/update/UpdateScmResult.java?view=diff&rev=517196&r1=517195&r2=517196
==============================================================================
--- 
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/update/UpdateScmResult.java
 (original)
+++ 
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/update/UpdateScmResult.java
 Mon Mar 12 06:04:31 2007
@@ -21,6 +21,7 @@
 
 import org.apache.maven.scm.ScmResult;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -62,6 +63,10 @@
 
     public List getChanges()
     {
+        if ( changes == null )
+        {
+            return new ArrayList();
+        }
         return changes;
     }