Apache
/
archiva
mirror of https://github.com/apache/archiva.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[MRM-1744] updating managed repository fail to correctly update maven index directory. 

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1443216 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Olivier Lamy 2013-02-06 21:21:01 +00:00
parent d9781d064a
commit c606acd784
1 changed files with 25 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/managed/DefaultManagedRepositoryAdmin.java
View File

@ -70,7 +70,7 @@ import java.util.Map;
* *
* @author Olivier Lamy * @author Olivier Lamy
*/ */
@Service ( "managedRepositoryAdmin#default" ) @Service( "managedRepositoryAdmin#default" )
public class DefaultManagedRepositoryAdmin public class DefaultManagedRepositoryAdmin
extends AbstractRepositoryAdmin extends AbstractRepositoryAdmin
implements ManagedRepositoryAdmin implements ManagedRepositoryAdmin
@ -81,7 +81,7 @@ public class DefaultManagedRepositoryAdmin
public static final String STAGE_REPO_ID_END = "-stage"; public static final String STAGE_REPO_ID_END = "-stage";
@Inject @Inject
@Named ( value = "archivaTaskScheduler#repository" ) @Named( value = "archivaTaskScheduler#repository" )
private RepositoryArchivaTaskScheduler repositoryTaskScheduler; private RepositoryArchivaTaskScheduler repositoryTaskScheduler;
@Inject @Inject
@ -339,7 +339,7 @@ public class DefaultManagedRepositoryAdmin
} }
catch ( Exception e ) catch ( Exception e )
{ {
throw new RepositoryAdminException( "Error saving configuration for delete action" + e.getMessage(), e); throw new RepositoryAdminException( "Error saving configuration for delete action" + e.getMessage(), e );
} }
return Boolean.TRUE; return Boolean.TRUE;
@ -468,9 +468,13 @@ public class DefaultManagedRepositoryAdmin
ManagedRepositoryConfiguration toremove = configuration.findManagedRepositoryById( managedRepository.getId() ); ManagedRepositoryConfiguration toremove = configuration.findManagedRepositoryById( managedRepository.getId() );
boolean updateIndexContext = false;
if ( toremove != null ) if ( toremove != null )
{ {
configuration.removeManagedRepository( toremove ); configuration.removeManagedRepository( toremove );
updateIndexContext = !StringUtils.equals( toremove.getIndexDir(), managedRepository.getIndexDirectory() );
} }
ManagedRepositoryConfiguration stagingRepository = getStageRepoConfig( toremove ); ManagedRepositoryConfiguration stagingRepository = getStageRepoConfig( toremove );
@ -518,7 +522,24 @@ public class DefaultManagedRepositoryAdmin
{ {
repositorySession.close(); repositorySession.close();
} }
createIndexContext( managedRepository );
if ( updateIndexContext )
{
try
{
IndexingContext indexingContext = indexer.getIndexingContexts().get( managedRepository.getId() );
if ( indexingContext != null )
{
indexer.removeIndexingContext( indexingContext, true );
}
createIndexContext( managedRepository );
}
catch ( IOException e )
{
throw new RepositoryAdminException( e.getMessage(), e );
}
}
return true; return true;
} }