Altitude/AlttdGriefPrevention
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

BugFix: Stack overflow in database boot.

Browse Source 
Oops.
This commit is contained in:
ryanhamshire 2014-10-13 19:08:43 -07:00
parent b86b5809c3
commit c4f7236e5f
2 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/me/ryanhamshire/GriefPrevention/DatabaseDataStore.java
View File

@ -217,9 +217,7 @@ public class DatabaseDataStore extends DataStore
{ {
try try
{ {
//skip subdivisions
long parentId = results.getLong("parentid"); long parentId = results.getLong("parentid");
long claimID = results.getLong("id"); long claimID = results.getLong("id");
Location lesserBoundaryCorner = null; Location lesserBoundaryCorner = null;
@ -251,7 +249,7 @@ public class DatabaseDataStore extends DataStore
UUID ownerID = null; UUID ownerID = null;
if(ownerName.isEmpty()) if(ownerName.isEmpty())
{ {
ownerID = null; //administrative land claim ownerID = null; //administrative land claim or subdivision
} }
else if(this.getSchemaVersion() < 1) else if(this.getSchemaVersion() < 1)
{ {
@ -312,6 +310,7 @@ public class DatabaseDataStore extends DataStore
GriefPrevention.AddLogEntry("Unable to load a claim. Details: " + e.getMessage() + " ... " + results.toString()); GriefPrevention.AddLogEntry("Unable to load a claim. Details: " + e.getMessage() + " ... " + results.toString());
e.printStackTrace(); e.printStackTrace();
} }
}
//add subdivisions to their parent claims //add subdivisions to their parent claims
for(Claim childClaim : subdivisionsToLoad) for(Claim childClaim : subdivisionsToLoad)
@ -323,7 +322,6 @@ public class DatabaseDataStore extends DataStore
childClaim.parent = topLevelClaim; childClaim.parent = topLevelClaim;
topLevelClaim.children.add(childClaim); topLevelClaim.children.add(childClaim);
childClaim.inDataStore = true; childClaim.inDataStore = true;
}
} }
for(int i = 0; i < claimsToRemove.size(); i++) for(int i = 0; i < claimsToRemove.size(); i++)