BugFix: Stack overflow in database boot.

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

View File

@ -217,9 +217,7 @@ public class DatabaseDataStore extends DataStore
{
try
{
//skip subdivisions
long parentId = results.getLong("parentid");
long claimID = results.getLong("id");
Location lesserBoundaryCorner = null;
@ -251,7 +249,7 @@ public class DatabaseDataStore extends DataStore
UUID ownerID = null;
if(ownerName.isEmpty())
{
ownerID = null; //administrative land claim
ownerID = null; //administrative land claim or subdivision
}
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());
e.printStackTrace();
}
}
//add subdivisions to their parent claims
for(Claim childClaim : subdivisionsToLoad)
@ -323,7 +322,6 @@ public class DatabaseDataStore extends DataStore
childClaim.parent = topLevelClaim;
topLevelClaim.children.add(childClaim);
childClaim.inDataStore = true;
}
}
for(int i = 0; i < claimsToRemove.size(); i++)