From: Maria Odea B. Ching <oching@apache.org>
Date: Fri, 15 Oct 2010 05:15:51 +0000 (+0000)
Subject: check if metadata exists first before updating and copying to target repo
X-Git-Tag: archiva-1.4-M1~899
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=b719ecb81801d0ea69bcf5ece393d731cbe4d4f1;p=archiva.git

check if metadata exists first before updating and copying to target repo


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

diff --git a/archiva-modules/plugins/stage-repository-merge/src/main/java/org/apache/archiva/stagerepository/merge/Maven2RepositoryMerger.java b/archiva-modules/plugins/stage-repository-merge/src/main/java/org/apache/archiva/stagerepository/merge/Maven2RepositoryMerger.java
index 7b45b067d..294956a64 100644
--- a/archiva-modules/plugins/stage-repository-merge/src/main/java/org/apache/archiva/stagerepository/merge/Maven2RepositoryMerger.java
+++ b/archiva-modules/plugins/stage-repository-merge/src/main/java/org/apache/archiva/stagerepository/merge/Maven2RepositoryMerger.java
@@ -187,37 +187,44 @@ public class Maven2RepositoryMerger
                 pathTranslator.toFile( new File( sourceRepoPath ), artifactMetadata.getNamespace(),
                                        artifactMetadata.getProject(), artifactMetadata.getVersion(),
                                        METADATA_FILENAME );
-            String relativePathToVersionMetadataFile =
-                versionMetaDataFileInSourceRepo.getAbsolutePath().split( sourceRepoPath )[1];
-            File versionMetaDataFileInTargetRepo = new File( targetRepoPath, relativePathToVersionMetadataFile );
 
-            if ( !versionMetaDataFileInTargetRepo.exists() )
+            if( versionMetaDataFileInSourceRepo.exists() )
             {
-                copyFile( versionMetaDataFileInSourceRepo, versionMetaDataFileInTargetRepo );
-            }
-            else
-            {
-                updateVersionMetadata( versionMetaDataFileInTargetRepo, artifactMetadata, lastUpdatedTimestamp );
+                String relativePathToVersionMetadataFile =
+                    versionMetaDataFileInSourceRepo.getAbsolutePath().split( sourceRepoPath )[1];
+                File versionMetaDataFileInTargetRepo = new File( targetRepoPath, relativePathToVersionMetadataFile );
+
+                if ( !versionMetaDataFileInTargetRepo.exists() )
+                {
+                    copyFile( versionMetaDataFileInSourceRepo, versionMetaDataFileInTargetRepo );
+                }
+                else
+                {
+                    updateVersionMetadata( versionMetaDataFileInTargetRepo, artifactMetadata, lastUpdatedTimestamp );
 
+                }
             }
 
             // updating project meta data file
             String projectDirectoryInSourceRepo = new File( versionMetaDataFileInSourceRepo.getParent() ).getParent();
             File projectMetadataFileInSourceRepo = new File( projectDirectoryInSourceRepo, METADATA_FILENAME );
 
-            String relativePathToProjectMetadataFile =
-                projectMetadataFileInSourceRepo.getAbsolutePath().split( sourceRepoPath )[1];
-            File projectMetadataFileInTargetRepo = new File( targetRepoPath, relativePathToProjectMetadataFile );
-
-            if ( !projectMetadataFileInTargetRepo.exists() )
+            if( projectMetadataFileInSourceRepo.exists() )
             {
+                String relativePathToProjectMetadataFile =
+                    projectMetadataFileInSourceRepo.getAbsolutePath().split( sourceRepoPath )[1];
+                File projectMetadataFileInTargetRepo = new File( targetRepoPath, relativePathToProjectMetadataFile );
 
-                copyFile( versionMetaDataFileInSourceRepo, projectMetadataFileInSourceRepo );
-            }
-            else
-            {
-                updateProjectMetadata( projectMetadataFileInTargetRepo, artifactMetadata, lastUpdatedTimestamp,
-                                       timestamp );
+                if ( !projectMetadataFileInTargetRepo.exists() )
+                {
+
+                    copyFile( projectMetadataFileInSourceRepo, projectMetadataFileInSourceRepo );
+                }
+                else
+                {
+                    updateProjectMetadata( projectMetadataFileInTargetRepo, artifactMetadata, lastUpdatedTimestamp,
+                                           timestamp );
+                }
             }
         }