Upstream
/
ChestShop-3
mirror of https://github.com/ChestShop-authors/ChestShop-3.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Cleanup: Fix potential NPE in Updater

This commit is contained in:
Phoenix616 2023-03-01 18:34:21 +01:00
parent 92a013dd10
commit 385672ecd4
No known key found for this signature in database
GPG Key ID: 40E2321E71738EB0
1 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/main/java/com/Acrobot/ChestShop/Updater/Updater.java
View File

@ -393,22 +393,27 @@ public final class Updater {
if (this.pluginFile(dFile.getName())) {
final File oFile = new File(this.plugin.getDataFolder().getParent(), dFile.getName()); // Get current dir
final File[] contents = oFile.listFiles(); // List of existing files in the current dir
for (final File cFile : dFile.listFiles()) // Loop through all the files in the new dir
{
boolean found = false;
for (final File xFile : contents) // Loop through contents to see if it exists
final File[] newFiles = dFile.listFiles();
if (newFiles != null) {
for (final File cFile : newFiles) // Loop through all the files in the new dir
{
if (xFile.getName().equals(cFile.getName())) {
found = true;
break;
boolean found = false;
if (contents != null) {
for (final File xFile : contents) // Loop through contents to see if it exists
{
if (xFile.getName().equals(cFile.getName())) {
found = true;
break;
}
}
}
if (!found) {
// Move the new file into the current dir
cFile.renameTo(new File(oFile.getCanonicalFile() + File.separator + cFile.getName()));
} else {
// This file already exists, so we don't need it anymore.
cFile.delete();
}
}
if (!found) {
// Move the new file into the current dir
cFile.renameTo(new File(oFile.getCanonicalFile() + File.separator + cFile.getName()));
} else {
// This file already exists, so we don't need it anymore.
cFile.delete();
}
}
}