revert changes made (MRM-1246)

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@825431 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/scanner/functors/ConsumerWantsFilePredicate.java b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/scanner/functors/ConsumerWantsFilePredicate.java
index adf75796db929643f1152c595fe9c400c4475e43..af3499874f119e3e95c922988204cdccee76f3f2 100644 (file)
--- a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/scanner/functors/ConsumerWantsFilePredicate.java
+++ b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/scanner/functors/ConsumerWantsFilePredicate.java
@@ -19,7 +19,6 @@ package org.apache.maven.archiva.repository.scanner.functors;
  * under the License.
  */
 
-import java.io.File;
 import java.util.List;
 
 import org.apache.commons.collections.Predicate;
@@ -63,19 +62,8 @@ public class ConsumerWantsFilePredicate
                     // 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;
                     }
                 }
             }

diff --git a/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/scanner/RepositoryScannerTest.java b/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/scanner/RepositoryScannerTest.java
index f7451460ca52d6cc550208dcfe47418c5e564b10..22cd183b0731cace52485da047789ff85599f521 100644 (file)
--- a/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/scanner/RepositoryScannerTest.java
+++ b/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/scanner/RepositoryScannerTest.java
@@ -140,7 +140,7 @@ public class RepositoryScannerTest
         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() );
     }