Author: olamy
Date: Wed Feb 6 22:49:25 2013
New Revision: 1443258
URL: http://svn.apache.org/viewvc?rev=1443258&view=rev
Log:
no need to create etc.. if the index already exists
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/managed/DefaultManagedRepositoryAdmin.java
archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/ArchivaIndexingTaskExecutor.java
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/managed/DefaultManagedRepositoryAdmin.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/managed/DefaultManagedRepositoryAdmin.java?rev=1443258&r1=1443257&r2=1443258&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/managed/DefaultManagedRepositoryAdmin.java
(original)
+++
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/managed/DefaultManagedRepositoryAdmin.java
Wed Feb 6 22:49:25 2013
@@ -584,6 +584,14 @@ public class DefaultManagedRepositoryAdm
throws RepositoryAdminException
{
+ IndexingContext context = indexer.getIndexingContexts().get(
repository.getId() );
+
+ if ( context != null )
+ {
+ log.debug( "skip adding repository indexingContent with id {} as
already exists", repository.getId() );
+ return context;
+ }
+
// take care first about repository location as can be relative
File repositoryDirectory = new File( repository.getLocation() );
@@ -602,13 +610,7 @@ public class DefaultManagedRepositoryAdm
try
{
- IndexingContext context = indexer.getIndexingContexts().get(
repository.getId() );
- if ( context != null )
- {
- log.debug( "skip adding repository indexingContent with id {}
as already exists", repository.getId() );
- return context;
- }
String indexDir = repository.getIndexDirectory();
File managedRepository = new File( repository.getLocation() );
Modified:
archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/ArchivaIndexingTaskExecutor.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/ArchivaIndexingTaskExecutor.java?rev=1443258&r1=1443257&r2=1443258&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/ArchivaIndexingTaskExecutor.java
(original)
+++
archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/ArchivaIndexingTaskExecutor.java
Wed Feb 6 22:49:25 2013
@@ -91,7 +91,7 @@ public class ArchivaIndexingTaskExecutor
}
/**
- * depending on current {@link Action} you have.
+ * depending on current {@link Task} you have.
* If {@link
org.apache.archiva.scheduler.indexing.ArtifactIndexingTask.Action.FINISH} &&
isExecuteOnEntireRepo:
* repository will be scanned.
*
