From 4ec9c4356f011964e9dde74e1eea9aa40f7c55be Mon Sep 17 00:00:00 2001 From: Brett Porter Date: Fri, 1 Aug 2014 14:20:56 +1000 Subject: [PATCH] re-order test --- .../archiva/rest/services/DefaultRepositoriesService.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRepositoriesService.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRepositoriesService.java index f69d56627..dae631306 100644 --- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRepositoriesService.java +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRepositoriesService.java @@ -170,6 +170,11 @@ public class DefaultRepositoriesService @Override public Boolean alreadyScanning( String repositoryId ) { + // check queue first to make sure it doesn't get dequeued between calls + if ( repositoryTaskScheduler.isProcessingRepositoryTask( repositoryId ) ) + { + return true; + } for ( RepositoryScannerInstance scan : repoScanner.getInProgressScans() ) { if ( scan.getRepository().getId().equals( repositoryId ) ) @@ -177,7 +182,7 @@ public class DefaultRepositoriesService return true; } } - return repositoryTaskScheduler.isProcessingRepositoryTask( repositoryId ); + return false; } @Override -- 2.39.5