JarvisBigBalls/Mineplex2018-withcommit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex

Browse Source
This commit is contained in:
CoderTim 2014-08-15 15:56:44 -04:00
commit ae6cb4aa22
2 changed files with 37 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
Plugins/Mineplex.Core/src/mineplex/core/portal/PortalRepository.java
View File

@ -14,6 +14,7 @@ import redis.clients.jedis.JedisPoolConfig;
import redis.clients.jedis.Pipeline;
import redis.clients.jedis.Response;
import redis.clients.jedis.Transaction;
import redis.clients.jedis.exceptions.JedisConnectionException;
public class PortalRepository
{
@ -64,9 +65,18 @@ public class PortalRepository
serverTransfers.add(serverTransfer);
}
}
catch (JedisConnectionException exception)
{
exception.printStackTrace();
_jedisPool.returnBrokenResource(jedis);
jedis = null;
}
finally
{
_jedisPool.returnResource(jedis);
if (jedis != null)
{
_jedisPool.returnResource(jedis);
}
}
return serverTransfers;
@ -91,9 +101,18 @@ public class PortalRepository
transaction.set(dataKey, serializedTransfer);
transaction.exec();
}
catch (JedisConnectionException exception)
{
exception.printStackTrace();
_jedisPool.returnBrokenResource(jedis);
jedis = null;
}
finally
{
_jedisPool.returnResource(jedis);
if (jedis != null)
{
_jedisPool.returnResource(jedis);
}
}
}
@ -124,9 +143,18 @@ public class PortalRepository
removedTransfer = true;
}
}
catch (JedisConnectionException exception)
{
exception.printStackTrace();
_jedisPool.returnBrokenResource(jedis);
jedis = null;
}
finally
{
_jedisPool.returnResource(jedis);
if (jedis != null)
{
_jedisPool.returnResource(jedis);
}
}
return removedTransfer;

7
Plugins/Mineplex.ServerData/src/mineplex/serverdata/RedisServerRepository.java
View File

@ -69,7 +69,12 @@ public class RedisServerRepository implements ServerRepository
for (Response<String> response : responses)
{
String serializedData = response.get();
servers.add(Utility.deserialize(serializedData, MinecraftServer.class));
MinecraftServer server = Utility.deserialize(serializedData, MinecraftServer.class);
if (server != null)
{
servers.add(server);
}
}
}
catch (JedisConnectionException exception)