archiva-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jzurb...@apache.org
Subject svn commit: r825431 - in /archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src: main/java/org/apache/maven/archiva/repository/scanner/functors/ test/java/org/apache/maven/archiva/repository/scanner/
Date Thu, 15 Oct 2009 08:18:29 GMT
Author: jzurbano
Date: Thu Oct 15 08:18:29 2009
New Revision: 825431

URL: http://svn.apache.org/viewvc?rev=825431&view=rev
Log:
revert changes made (MRM-1246)

Modified:
    archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/scanner/functors/ConsumerWantsFilePredicate.java
    archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/scanner/RepositoryScannerTest.java

Modified: archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/scanner/functors/ConsumerWantsFilePredicate.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/scanner/functors/ConsumerWantsFilePredicate.java?rev=825431&r1=825430&r2=825431&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/scanner/functors/ConsumerWantsFilePredicate.java
(original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/scanner/functors/ConsumerWantsFilePredicate.java
Thu Oct 15 08:18:29 2009
@@ -19,7 +19,6 @@
  * under the License.
  */
 
-import java.io.File;
 import java.util.List;
 
 import org.apache.commons.collections.Predicate;
@@ -63,19 +62,8 @@
                     // Timestamp finished points to the last successful scan, not this current
one.
                     if ( basefile.lastModified() < changesSince )
                     {
-                        // MRM-1246
-                        // compares the lastModified of the version-level (basefile) and
the project-level (parent) metadata
-                        File parent = basefile.getParentFile().getParentFile();
-                           
-                        if ( parent.lastModified() > basefile.lastModified() )
-                        {
-                            satisfies = true;
-                        }
-                        else 
-                        {
-                            // Skip file as no change has occurred.
-                            satisfies = false;   
-                        }
+                        // Skip file as no change has occurred.
+                        satisfies = false;
                     }
                 }
             }

Modified: archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/scanner/RepositoryScannerTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/scanner/RepositoryScannerTest.java?rev=825431&r1=825430&r2=825431&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/scanner/RepositoryScannerTest.java
(original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/scanner/RepositoryScannerTest.java
Thu Oct 15 08:18:29 2009
@@ -140,7 +140,7 @@
         assertNotNull( "Stats should not be null.", stats );
         assertEquals( "Stats.totalFileCount", 4, stats.getTotalFileCount() );
         assertEquals( "Stats.newFileCount", 3, stats.getNewFileCount() );
-        assertEquals( "Processed Count", 3, consumer.getProcessCount() );
+        assertEquals( "Processed Count", 2, consumer.getProcessCount() );
         assertEquals( "Processed Count (of invalid items)", 1, badconsumer.getProcessCount()
);
     }
 



Mime
View raw message