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

SQL database - split loadProfile to have retry flag

Browse Source 
Instead of assuming that newUser() worked as intended, we cycle back around into the method.
This also removes the possibility of infinite loops from the writeMissingRows() code path.
This commit is contained in:
riking 2013-10-05 18:07:11 -07:00 committed by TfT_02
parent 70eb67dd6a
commit 96b54387fe
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/main/java/com/gmail/nossr50/database/SQLDatabaseManager.java
View File

@ -347,6 +347,10 @@ public final class SQLDatabaseManager implements DatabaseManager {
} }
public PlayerProfile loadPlayerProfile(String playerName, boolean create) { public PlayerProfile loadPlayerProfile(String playerName, boolean create) {
return _loadPlayerProfile(playerName, create, true);
}
private PlayerProfile _loadPlayerProfile(String playerName, boolean create, boolean retry) {
if (!checkConnected()) { if (!checkConnected()) {
return new PlayerProfile(playerName, false); // return fake profile if not connected return new PlayerProfile(playerName, false); // return fake profile if not connected
} }
@ -396,6 +400,11 @@ public final class SQLDatabaseManager implements DatabaseManager {
// Problem, nothing was returned // Problem, nothing was returned
// Quit if this is second time around
if (!retry) {
return new PlayerProfile(playerName, false);
}
// First, read User Id - this is to check for orphans // First, read User Id - this is to check for orphans
int id = readId(playerName); int id = readId(playerName);
@ -404,14 +413,16 @@ public final class SQLDatabaseManager implements DatabaseManager {
// There is no such user // There is no such user
if (create) { if (create) {
newUser(playerName); newUser(playerName);
return _loadPlayerProfile(playerName, false, false);
} }
return new PlayerProfile(playerName, create); // Return unloaded profile if can't create
return new PlayerProfile(playerName, false);
} }
// There is such a user // There is such a user
writeMissingRows(id); writeMissingRows(id);
// Retry, and abort on re-failure // Retry, and abort on re-failure
return loadPlayerProfile(playerName, false); return _loadPlayerProfile(playerName, create, false);
} }
public void convertUsers(DatabaseManager destination) { public void convertUsers(DatabaseManager destination) {