MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2025-12-16 14:23:28 +07:00
Code Issues Packages Projects Releases Wiki Activity

Revert "maven artifacts resolution: mark bad jars corrupted but don't delete them"

Browse Source 
This reverts commit c31746e6f09a670ebcfac5ff7f329f2df233ae19.

GitOrigin-RevId: 763adcb8aaa1b30ca4a9a111cfe1cd32cb46854c
This commit is contained in:
Vladislav.Yaroshchuk
2023-03-29 11:25:43 +04:00
committed by intellij-monorepo-bot
parent 9eff1bd159
commit 5444857716
1 changed files with 4 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
aether-dependency-resolver/src/org/jetbrains/idea/maven/aether/StrictLocalRepositoryManager.java
View File

@@ -11,11 +11,8 @@ import org.slf4j.LoggerFactory;
import java.io.File;
import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.zip.ZipFile;
import static java.nio.file.StandardCopyOption.REPLACE_EXISTING;
class StrictLocalRepositoryManager implements LocalRepositoryManager {
private static final Logger LOG = LoggerFactory.getLogger(StrictLocalRepositoryManager.class);
private static final boolean STRICT_VALIDATION = "true".equals(System.getProperty("org.jetbrains.idea.maven.aether.strictValidation"));
@@ -35,12 +32,6 @@ class StrictLocalRepositoryManager implements LocalRepositoryManager {
return result;
}
/**
* Checks whether {@code archive} file is valid ZIP. If ZIP is invalid, renames the file adding {@code .corruptedXXXXX} suffix.
*
* @param archive ZIP archive file
* @return true if valid, false if not
*/
boolean isValidArchive(File archive) {
if (!archive.exists()) return false;
// TODO: to be revised after IDEA-269182 is implemented
@@ -50,25 +41,16 @@ class StrictLocalRepositoryManager implements LocalRepositoryManager {
entriesCount = zip.size();
}
catch (IOException e) {
/* Short exception message is enough */
LOG.warn("Unable to read a number of entries in " + archive + ": " + e.getMessage());
LOG.warn("Unable to read a number of entries in " + archive, e);
entriesCount = 0;
}
if (entriesCount <= 0) {
LOG.warn(archive + " is probably corrupted, marking as corrupted");
LOG.warn(archive + " is probably corrupted, deleting");
try {
Path archiveAsPath = archive.toPath();
if (Files.exists(archiveAsPath)) {
String prefix = archiveAsPath.getFileName() + ".corrupted";
String suffix = "";
Path corruptedArchivePath = Files.createTempFile(archiveAsPath.getParent(), prefix, suffix);
Files.move(archiveAsPath, corruptedArchivePath, REPLACE_EXISTING);
LOG.warn(archive + " is moved to " + corruptedArchivePath);
}
Files.deleteIfExists(archive.toPath());
}
catch (IOException e) {
throw new RuntimeException("Unable to move " + archive, e);
throw new RuntimeException("Unable to delete " + archive, e);
}
return false;
}