[MRESOLVER-305] Handle blocked state at connector level (s4u#228)

As blocked is really about block remote access. Locally cached things should not be affected, but current solution did not cover all execution paths. --- https://issues.apache.org/jira/browse/MRESOLVER-305
pzygielo · Dec 22, 2022 · c5619a6 · c5619a6
1 parent e4d4140
commit c5619a6
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 14 deletions.
diff --git a/...resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultArtifactResolver.java b/...resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultArtifactResolver.java
@@ -575,20 +575,6 @@ private void performDownloads( RepositorySystemSession session, ResolutionGroup
 
         try
         {
-            RemoteRepository repo = group.repository;
-            if ( repo.isBlocked() )
-            {
-                if ( repo.getMirroredRepositories().isEmpty() )
-                {
-                    throw new NoRepositoryConnectorException( repo, "Blocked repository: " + repo );
-                }
-                else
-                {
-                    throw new NoRepositoryConnectorException( repo, "Blocked mirror for repositories: "
-                            + repo.getMirroredRepositories() );
-                }
-            }
-
             try ( RepositoryConnector connector =
                           repositoryConnectorProvider.newRepositoryConnector( session, group.repository ) )
             {

diff --git a/...pl/src/main/java/org/eclipse/aether/internal/impl/DefaultRepositoryConnectorProvider.java b/...pl/src/main/java/org/eclipse/aether/internal/impl/DefaultRepositoryConnectorProvider.java
@@ -109,6 +109,20 @@ public RepositoryConnector newRepositoryConnector( RepositorySystemSession sessi
         throws NoRepositoryConnectorException
     {
         requireNonNull( repository, "remote repository cannot be null" );
+
+        if ( repository.isBlocked() )
+        {
+            if ( repository.getMirroredRepositories().isEmpty() )
+            {
+                throw new NoRepositoryConnectorException( repository, "Blocked repository: " + repository );
+            }
+            else
+            {
+                throw new NoRepositoryConnectorException( repository, "Blocked mirror for repositories: "
+                        + repository.getMirroredRepositories() );
+            }
+        }
+
         RemoteRepositoryFilter filter = remoteRepositoryFilterManager.getRemoteRepositoryFilter( session );
 
         PrioritizedComponents<RepositoryConnectorFactory> factories = new PrioritizedComponents<>( session );