Author: oching
Date: Tue Feb 24 08:35:43 2009
New Revision: 747306
URL: http://svn.apache.org/viewvc?rev=747306&view=rev
Log:
set repository id in ArtifactUpdateDatabaseConsumer only when repository id is
null
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-database-consumers/src/main/java/org/apache/maven/archiva/consumers/database/ArtifactUpdateDatabaseConsumer.java
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-database-consumers/src/main/java/org/apache/maven/archiva/consumers/database/ArtifactUpdateDatabaseConsumer.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-database-consumers/src/main/java/org/apache/maven/archiva/consumers/database/ArtifactUpdateDatabaseConsumer.java?rev=747306&r1=747305&r2=747306&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-database-consumers/src/main/java/org/apache/maven/archiva/consumers/database/ArtifactUpdateDatabaseConsumer.java
(original)
+++
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-database-consumers/src/main/java/org/apache/maven/archiva/consumers/database/ArtifactUpdateDatabaseConsumer.java
Tue Feb 24 08:35:43 2009
@@ -57,7 +57,7 @@
public class ArtifactUpdateDatabaseConsumer
extends AbstractMonitoredConsumer
implements KnownRepositoryContentConsumer, RegistryListener, Initializable
-{
+{
private static final String TYPE_NOT_ARTIFACT = "file-not-artifact";
private static final String DB_ERROR = "db-error";
@@ -161,10 +161,13 @@
{
return;
}
-
+
try
{
- artifact.getModel().setRepositoryId( this.repository.getId() );
+ if( artifact.getModel().getRepositoryId() == null )
+ {
+ artifact.getModel().setRepositoryId( this.repository.getId() );
+ }
// Calculate the hashcodes.
File artifactFile = new File( this.repositoryDir, path );