Author: olamy Date: Tue Jan 11 23:45:29 2011 New Revision: 1057938 URL: http://svn.apache.org/viewvc?rev=1057938&view=rev Log: fix junit
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/AbstractFileCheckingConsumer.java maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/branch/SvnBranchCommand.java Modified: maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/AbstractFileCheckingConsumer.java URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/AbstractFileCheckingConsumer.java?rev=1057938&r1=1057937&r2=1057938&view=diff ============================================================================== --- maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/AbstractFileCheckingConsumer.java (original) +++ maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/AbstractFileCheckingConsumer.java Tue Jan 11 23:45:29 2011 @@ -21,6 +21,7 @@ package org.apache.maven.scm.provider.sv import java.io.File; import java.util.ArrayList; +import java.util.Iterator; import java.util.List; import org.apache.maven.scm.ScmFile; @@ -74,13 +75,13 @@ public abstract class AbstractFileChecki if ( !filtered ) { - for ( ScmFile file : files ) + for ( Iterator<ScmFile> ite = files.iterator(); ite.hasNext(); ) { - + ScmFile file = ite.next(); if ( !file.getStatus().equals( ScmFileStatus.DELETED ) && !new File( workingDirectory, file.getPath() ).isFile() ) { - files.remove( file ); + ite.remove(); } } Modified: maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/branch/SvnBranchCommand.java URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/branch/SvnBranchCommand.java?rev=1057938&r1=1057937&r2=1057938&view=diff ============================================================================== --- maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/branch/SvnBranchCommand.java (original) +++ maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/branch/SvnBranchCommand.java Tue Jan 11 23:45:29 2011 @@ -64,7 +64,7 @@ public class SvnBranchCommand throw new ScmException( "branch name must be specified" ); } - if ( fileSet.getFileList().isEmpty() ) + if ( !fileSet.getFileList().isEmpty() ) { throw new ScmException( "This provider doesn't support branching subsets of a directory" ); }