External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-22 19:41:59 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #4682 from delftswa2018/hotfix/resolving-unaccepted-changes

Browse source 
Hotfix - resolving unaccepted changes
This commit is contained in:
Oleg Agafonov 2018-03-29 17:25:04 +04:00 • committed by GitHub
commit 8563c6d865
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Mage.Client/src/main/java/org/mage/card/arcane/Util.java
View file

@ -1,5 +1,7 @@
package org.mage.card.arcane; package org.mage.card.arcane;
import mage.util.StreamUtils;
import java.io.IOException; import java.io.IOException;
import java.net.DatagramPacket; import java.net.DatagramPacket;
import java.net.DatagramSocket; import java.net.DatagramSocket;
@ -42,7 +44,7 @@ public final class Util {
socket = new DatagramSocket(); socket = new DatagramSocket();
broadcast(socket, data, port, NetworkInterface.getNetworkInterfaces()); broadcast(socket, data, port, NetworkInterface.getNetworkInterfaces());
} finally { } finally {
socket.close(); StreamUtils.closeQuietly(socket);
} }
} }

2
Mage.Server/src/main/java/mage/server/ChatSession.java
View file

@ -90,8 +90,8 @@ public class ChatSession {
String userName = clients.get(userId); String userName = clients.get(userId);
if (reason != DisconnectReason.LostConnection) { // for lost connection the user will be reconnected or session expire so no removeUserFromAllTablesAndChat of chat yet if (reason != DisconnectReason.LostConnection) { // for lost connection the user will be reconnected or session expire so no removeUserFromAllTablesAndChat of chat yet
final Lock w = lock.writeLock(); final Lock w = lock.writeLock();
try {
w.lock(); w.lock();
try {
clients.remove(userId); clients.remove(userId);
} finally { } finally {
w.unlock(); w.unlock();

2
Mage.Server/src/main/java/mage/server/UserManager.java
View file

@ -231,8 +231,8 @@ public enum UserManager {
} }
logger.debug("Users to remove " + toRemove.size()); logger.debug("Users to remove " + toRemove.size());
final Lock w = lock.readLock(); final Lock w = lock.readLock();
try {
w.lock(); w.lock();
try {
for (User user : toRemove) { for (User user : toRemove) {
users.remove(user.getId()); users.remove(user.getId());
} }