From 8a668c488037db1a96cd4a7ed184c0cb86de5203 Mon Sep 17 00:00:00 2001
From: magenoxx <magenoxx@gmail>
Date: Sun, 16 Oct 2011 18:05:41 +0400
Subject: [PATCH] server message fix

---
 .../java/mage/server/util/ServerMessagesUtil.java  | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/Mage.Server/src/main/java/mage/server/util/ServerMessagesUtil.java b/Mage.Server/src/main/java/mage/server/util/ServerMessagesUtil.java
index 3ab4a80084c..4f5f40e2fd9 100644
--- a/Mage.Server/src/main/java/mage/server/util/ServerMessagesUtil.java
+++ b/Mage.Server/src/main/java/mage/server/util/ServerMessagesUtil.java
@@ -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) {