Failure/foul-magics
1
0
Fork 0
forked from External/mage
Code Pull requests Releases Packages Activity Actions

server message fix

Browse source
This commit is contained in:
magenoxx 2011-10-16 18:05:41 +04:00
parent 0ae44e370c
commit 8a668c4880
1 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Mage.Server/src/main/java/mage/server/util/ServerMessagesUtil.java
View file

@ -113,6 +113,7 @@ public class ServerMessagesUtil {
if (!externalFile.exists()) {
log.warn("Couldn't find server.msg.txt using external path: " + pathToExternalMessages);
pathToExternalMessages = null; // not to repeat error action again
externalFile = null;
} else if (!externalFile.canRead()) {
log.warn("Couldn't read (no access) server.msg.txt using external path: " + pathToExternalMessages);
pathToExternalMessages = null; // not to repeat error action again
@ -130,12 +131,13 @@ public class ServerMessagesUtil {
File file = new File(SERVER_MSG_TXT_FILE);
if (!file.exists() || !file.canRead()) {
log.warn("Couldn't find server.msg.txt using path: " + SERVER_MSG_TXT_FILE);
}
try {
is = new FileInputStream(file);
} catch (Exception f) {
log.error(f, f);
ignore = true;
} else {
try {
is = new FileInputStream(file);
} catch (Exception f) {
log.error(f, f);
ignore = true;
}
}
}
if (is == null) {