EpicKnarvik97/mcMMO
EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2024-11-29 08:36:45 +01:00
Code Issues Projects Releases Wiki Activity

Flatfile loadProfile - place newUser() inside of try block

Browse Source 
This fixes incorrect behavior in the edge-case where an IOException occurs when reading (but not writing) the flatfile database.
This commit is contained in:
riking 2013-10-05 16:14:46 -07:00 committed by TfT_02
parent 77f9f40065
commit 70eb67dd6a
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/main/java/com/gmail/nossr50/database/FlatfileDatabaseManager.java
View File

@ -387,22 +387,30 @@ public final class FlatfileDatabaseManager implements DatabaseManager {
}
PlayerProfile p = loadFromLine(character);
in.close();
return p;
}
// Didn't find the player, create a new one
if (create) {
newUser(playerName);
return new PlayerProfile(playerName, true);
}
}
catch (Exception e) {
e.printStackTrace();
}
finally {
tryClose(in);
// Silly inlining of tryClose() because the compiler is giving a warning when I use tryClose()
try {
if (in != null) {
in.close();
}
}
catch (IOException ignored) {}
}
}
if (create) {
newUser(playerName);
return new PlayerProfile(playerName, true);
}
// Return unloaded profile
return new PlayerProfile(playerName);
}