Limework/RedisBungee
2
0
Fork 0
mirror of https://github.com/proxiodev/RedisBungee.git synced 2026-04-08 08:00:26 +00:00
Code Releases Activity

Changed all previous uses of return(Broken)Resource to try-with-resources

Browse Source
This commit is contained in:
Tux
2015-06-06 17:30:45 -04:00
parent d68b2713c4
commit 712698c76c
2 changed files with 8 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/main/java/com/imaginarycode/minecraft/redisbungee/DataManager.java
View File

@@ -56,8 +56,7 @@ public class DataManager implements Listener {
if (server != null)
return server;
Jedis tmpRsc = plugin.getPool().getResource();
try {
try (Jedis tmpRsc = plugin.getPool().getResource()) {
server = tmpRsc.hget("player:" + uuid, "server");
if (server == null)
@@ -68,11 +67,7 @@ public class DataManager implements Listener {
} catch (JedisConnectionException e) {
// Redis server has disappeared!
plugin.getLogger().log(Level.SEVERE, "Unable to get connection from pool - did your Redis server go away?", e);
if (tmpRsc != null)
plugin.getPool().returnBrokenResource(tmpRsc);
throw new RuntimeException("Unable to get server for " + uuid, e);
} finally {
plugin.getPool().returnResource(tmpRsc);
}
}
@@ -87,8 +82,7 @@ public class DataManager implements Listener {
if (server != null)
return server;
Jedis tmpRsc = plugin.getPool().getResource();
try {
try (Jedis tmpRsc = plugin.getPool().getResource()) {
server = tmpRsc.hget("player:" + uuid, "proxy");
if (server == null)
@@ -99,11 +93,7 @@ public class DataManager implements Listener {
} catch (JedisConnectionException e) {
// Redis server has disappeared!
plugin.getLogger().log(Level.SEVERE, "Unable to get connection from pool - did your Redis server go away?", e);
if (tmpRsc != null)
plugin.getPool().returnBrokenResource(tmpRsc);
throw new RuntimeException("Unable to get server for " + uuid, e);
} finally {
plugin.getPool().returnResource(tmpRsc);
}
}
@@ -118,8 +108,7 @@ public class DataManager implements Listener {
if (address != null)
return address;
Jedis tmpRsc = plugin.getPool().getResource();
try {
try (Jedis tmpRsc = plugin.getPool().getResource()) {
String result = tmpRsc.hget("player:" + uuid, "ip");
if (result != null) {
address = InetAddresses.forString(result);
@@ -130,11 +119,7 @@ public class DataManager implements Listener {
} catch (JedisConnectionException e) {
// Redis server has disappeared!
plugin.getLogger().log(Level.SEVERE, "Unable to get connection from pool - did your Redis server go away?", e);
if (tmpRsc != null)
plugin.getPool().returnBrokenResource(tmpRsc);
throw new RuntimeException("Unable to get server for " + uuid, e);
} finally {
plugin.getPool().returnResource(tmpRsc);
}
}
@@ -149,8 +134,7 @@ public class DataManager implements Listener {
if (time != null)
return time;
Jedis tmpRsc = plugin.getPool().getResource();
try {
try (Jedis tmpRsc = plugin.getPool().getResource()) {
String result = tmpRsc.hget("player:" + uuid, "online");
if (result != null)
try {
@@ -188,11 +172,7 @@ public class DataManager implements Listener {
} catch (JedisConnectionException e) {
// Redis server has disappeared!
plugin.getLogger().log(Level.SEVERE, "Unable to get connection from pool - did your Redis server go away?", e);
if (tmpRsc != null)
plugin.getPool().returnBrokenResource(tmpRsc);
throw new RuntimeException("Unable to get server for " + uuid, e);
} finally {
plugin.getPool().returnResource(tmpRsc);
}
}