Clean old temporary local maven index cache dir before scan

When the last local maven repo scan didn't clean up properly, for example when the JVM exits during scan, subsequent scans would throw "java.io.IOException: Cannot create temporary directory".
DevCharly · Jul 16, 2024 · 76d9b45 · 76d9b45
1 parent 2027c7d
commit 76d9b45
Showing 1 changed file with 12 additions and 16 deletions.
diff --git a/java/maven.indexer/src/org/netbeans/modules/maven/indexer/NexusRepositoryIndexerImpl.java b/java/maven.indexer/src/org/netbeans/modules/maven/indexer/NexusRepositoryIndexerImpl.java
@@ -102,7 +102,6 @@
 import org.codehaus.plexus.component.repository.ComponentDescriptor;
 import org.codehaus.plexus.component.repository.ComponentRequirement;
 import org.codehaus.plexus.component.repository.exception.ComponentLookupException;
-import org.codehaus.plexus.util.FileUtils;
 import org.netbeans.api.annotations.common.CheckForNull;
 import org.netbeans.api.annotations.common.NullAllowed;
 import org.netbeans.modules.maven.embedder.EmbedderFactory;
@@ -613,7 +612,7 @@ private void indexLoadedRepo(final RepositoryInfo repo, boolean updateLocal) thr
                     try {
                         // Ensure no stale cache files are left
                         removeGroupCache(repo);
-                        scan(indexingContext, null, repoListener, updateLocal);
+                        scanLocalRepo(indexingContext, null, repoListener, updateLocal);
                         storeGroupCache(repo, indexingContext);
                     } finally {
                         repoListener.close();
@@ -796,34 +795,34 @@ public void shutdownAll() {
      * @see DefaultScannerListener
      * @see #artifactDiscovered(ArtifactContext, IndexingContext)
      */
-    private void scan(IndexingContext context, String fromPath, ArtifactScanningListener listener, boolean update) throws IOException {
+    private void scanLocalRepo(IndexingContext context, String fromPath, ArtifactScanningListener listener, boolean update) throws IOException {
 
         File repositoryDirectory = context.getRepository();
         if (repositoryDirectory == null) {
             return;  // nothing to scan
         }
- 
+
         if (!repositoryDirectory.exists()) {
             throw new IOException( "Repository directory " + repositoryDirectory + " does not exist" );
         }
- 
+
         // always use cache directory when reindexing
-        File tmpDir = new File(Places.getCacheDirectory(), "tmp-" + context.getRepositoryId());
-        if (!tmpDir.mkdirs()) {
-            throw new IOException( "Cannot create temporary directory: " + tmpDir );
+        Path tmpDir = Places.getCacheDirectory().toPath().resolve("tmp-" + context.getRepositoryId());
+        if (Files.exists(tmpDir)) {
+            removeDir(tmpDir);
         }
-        File tmpFile = new File(tmpDir, context.getId() + "-tmp"); // TODO: purpose of file?
- 
+        Files.createDirectory(tmpDir);
+
         IndexingContext tmpContext = null;
         try {
-            FSDirectory directory = FSDirectory.open(tmpDir.toPath());
+            FSDirectory directory = FSDirectory.open(tmpDir);
             if (update) {
                 IndexUtils.copyDirectory(context.getIndexDirectory(), directory);
             }
             tmpContext = new DefaultIndexingContext( context.getId() + "-tmp",
                                                      context.getRepositoryId(),
                                                      context.getRepository(),
-                                                     tmpDir,
+                                                     tmpDir.toFile(),
                                                      context.getRepositoryUrl(),
                                                      context.getIndexUpdateUrl(),
                                                      context.getIndexCreators(),
@@ -840,10 +839,7 @@ private void scan(IndexingContext context, String fromPath, ArtifactScanningList
             if (tmpContext != null) {
                 tmpContext.close( true );
             }
-            if (tmpFile.exists()) {
-                tmpFile.delete();
-            }
-            FileUtils.deleteDirectory(tmpDir);
+            removeDir(tmpDir);
         }
     }