Upstream/Plan
1
0
Fork 0
mirror of https://github.com/plan-player-analytics/Plan.git synced 2024-10-04 17:37:29 +02:00
Code Issues Projects Releases Wiki Activity

Fix bad merge

Browse Source
This commit is contained in:
Rsl1122 2019-03-31 15:40:56 +03:00
parent d47c310a70
commit 89bc90d0b5
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Plan/common/src/main/java/com/djrapitops/plan/system/info/server/ServerServerInfo.java
View File

@ -107,12 +107,18 @@ public class ServerServerInfo extends ServerInfo {
} }
} }
private Server updateDbInfo(UUID serverUUID) throws InterruptedException, ExecutionException, IOException { private void updateDbInfo(UUID serverUUID) {
Database db = dbSystem.getDatabase(); Database db = dbSystem.getDatabase();
Optional<Server> foundServer = db.query(ServerQueries.fetchServerMatchingIdentifier(serverUUID)); Optional<Server> foundServer = db.query(ServerQueries.fetchServerMatchingIdentifier(serverUUID));
if (!foundServer.isPresent()) { if (!foundServer.isPresent()) {
try {
server = registerServer(serverUUID); server = registerServer(serverUUID);
} catch (ExecutionException | IOException e) {
errorHandler.log(L.CRITICAL, this.getClass(), e);
} catch (InterruptedException e) {
Thread.currentThread().interrupt();
}
return; return;
} }
@ -132,7 +138,7 @@ public class ServerServerInfo extends ServerInfo {
db.executeTransaction(new StoreServerInformationTransaction(server)); db.executeTransaction(new StoreServerInformationTransaction(server));
} }
private Server registerServer() throws Exception { private Server registerServer() throws ExecutionException, InterruptedException, IOException {
return registerServer(generateNewUUID()); return registerServer(generateNewUUID());
} }