Fixing RepositoryGroupAdmin after refactor

archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/group/DefaultRepositoryGroupAdmin.java

@@ -165,7 +165,7 @@ public class DefaultRepositoryGroupAdmin
             throw new RepositoryAdminException("Removal of repository failed: " + e.getMessage(), e);
         }
         mergedRemoteIndexesScheduler.unschedule(
-            repositoryRegistry.getRepositoryGroup( repositoryGroupId ) );
+            repositoryGroup );
         triggerAuditEvent( repositoryGroupId, null, AuditEvent.DELETE_REPO_GROUP, auditInformation );
 
         return Boolean.TRUE;
@@ -204,6 +204,7 @@ public class DefaultRepositoryGroupAdmin
         org.apache.archiva.repository.RepositoryGroup rg = repositoryRegistry.getRepositoryGroup( repositoryGroup.getId( ) );
         mergedRemoteIndexesScheduler.unschedule( rg );
         mergedRemoteIndexesScheduler.schedule( rg, getMergedIndexDirectory( repositoryGroup.getId() ) );
+        triggerAuditEvent( repositoryGroup.getId(), null, AuditEvent.MODIFY_REPO_GROUP, auditInformation );
         return Boolean.TRUE;
     }
 

archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/RepositoryRegistry.java

@@ -1029,6 +1029,10 @@ public class RepositoryRegistry implements ConfigurationListener, RepositoryEven
     @SuppressWarnings( "unchecked" )
     public void removeRepository(Repository repo) throws RepositoryException
     {
+        if (repo==null) {
+            log.warn("Trying to remove null repository");
+            return;
+        }
         if (repo instanceof RemoteRepository ) {
             removeRepository( (RemoteRepository)repo );
         } else if (repo instanceof ManagedRepository) {
@@ -1057,6 +1061,7 @@ public class RepositoryRegistry implements ConfigurationListener, RepositoryEven
                 repo = managedRepositories.remove( id );
                 if (repo!=null) {
                     repo.close();
+                    removeRepositoryFromGroups(repo);
                     Configuration configuration = getArchivaConfiguration().getConfiguration();
                     ManagedRepositoryConfiguration cfg = configuration.findManagedRepositoryById( id );
                     if (cfg!=null) {
@@ -1079,6 +1084,13 @@ public class RepositoryRegistry implements ConfigurationListener, RepositoryEven
         }
     }
 
+    private void removeRepositoryFromGroups(ManagedRepository repo) {
+        if (repo!=null) {
+            repositoryGroups.values().stream().filter(repoGroup -> repoGroup instanceof EditableRepository).
+                    map(repoGroup -> (EditableRepositoryGroup) repoGroup).forEach(repoGroup -> repoGroup.removeRepository(repo));
+        }
+    }
+
     public void removeRepository(ManagedRepository managedRepository, Configuration configuration) throws RepositoryException
     {
         final String id = managedRepository.getId();
@@ -1089,6 +1101,7 @@ public class RepositoryRegistry implements ConfigurationListener, RepositoryEven
                 repo = managedRepositories.remove( id );
                 if (repo!=null) {
                     repo.close();
+                    removeRepositoryFromGroups(repo);
                     ManagedRepositoryConfiguration cfg = configuration.findManagedRepositoryById( id );
                     if (cfg!=null) {
                         configuration.removeManagedRepository( cfg );

archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/content/maven2/ManagedDefaultRepositoryContent.java

@@ -423,9 +423,11 @@ public class ManagedDefaultRepositoryContent
     public void setRepository( ManagedRepository repo )
     {
         this.repository = repo;
-        this.repoDir = PathUtil.getPathFromUri( repository.getLocation() );
-        if (repository instanceof EditableManagedRepository ) {
-            ((EditableManagedRepository)repository).setContent(this);
+        if (repo!=null) {
+            this.repoDir = PathUtil.getPathFromUri(repository.getLocation());
+            if (repository instanceof EditableManagedRepository) {
+                ((EditableManagedRepository) repository).setContent(this);
+            }
         }
 
     }