Sync old changes

Mage.Client/src/main/java/mage/client/util/SoftValuesLoadingCache.java

@@ -9,10 +9,12 @@ import com.google.common.base.Function;
 import com.google.common.cache.CacheLoader;
 import com.google.common.cache.ForwardingLoadingCache;
 import com.google.common.cache.LoadingCache;
+import org.apache.log4j.Logger;
 
 public class SoftValuesLoadingCache<K, V> extends ForwardingLoadingCache<K, Optional<V>> {
 
     private final LoadingCache<K, Optional<V>> cache;
+    private static final Logger logger = Logger.getLogger(SoftValuesLoadingCache.class);
 
     public SoftValuesLoadingCache(CacheLoader<K, Optional<V>> loader) {
         cache = newBuilder().softValues().build(loader);
@@ -35,8 +37,15 @@ public class SoftValuesLoadingCache<K, V> extends ForwardingLoadingCache<K, Opti
         try {
             return get(key).orElse(null);
         } catch (ExecutionException e) {
+            if (e.getCause() instanceof OutOfMemoryError) {
+                logger.warn("Out of memory error: try to increase free memory in launcher options (-xmx param)");
+                return null;
+            } else {
                 throw new RuntimeException(e);
             }
+        } catch (Throwable e) {
+            return null;
+        }
     }
 
     public V peekIfPresent(K key) {

Mage.Common/src/main/java/mage/remote/SessionImpl.java

@@ -1539,6 +1539,10 @@ public class SessionImpl implements Session {
 
     private void handleThrowable(Throwable t) {
         logger.fatal("Communication error", t);
+        if (t instanceof InterruptedException) {
+            logger.error("Was interrupted", new Throwable());
+        }
+
         // Probably this can cause hanging the client under certain circumstances as the disconnect method is synchronized
         // so check if it's needed
         // disconnect(true);

Mage.Tests/src/test/java/org/mage/test/utils/ExportJsonGameplayDataTest.java

@@ -25,6 +25,7 @@ import java.util.List;
 public class ExportJsonGameplayDataTest {
 
     private static final Logger logger = Logger.getLogger(ExportJsonGameplayDataTest.class);
+    private static final boolean MTGJSON_WRITE_TO_FILES = false;
 
     @Test
     @Ignore
@@ -116,10 +117,10 @@ public class ExportJsonGameplayDataTest {
 
             Gson gson = new GsonBuilder().setPrettyPrinting().create();
 
+            if (MTGJSON_WRITE_TO_FILES) {
                 String filePath = System.getProperty("user.dir") + "/json/" + set.getCode() + ".json";
                 File outputFile = new File(filePath);
                 final boolean mkdirs = outputFile.getParentFile().mkdirs();
-
                 try (Writer writer =
                              new BufferedWriter(
                                      new OutputStreamWriter(
@@ -132,6 +133,9 @@ public class ExportJsonGameplayDataTest {
                 } catch (Exception e) {
                     e.printStackTrace();
                 }
+            } else {
+                //System.out.println(gson.toJson(res));
+            }
         }
     }
 }

Mage/src/main/java/mage/game/permanent/token/Wurm1Token.java

@@ -1,4 +1,3 @@
-
 package mage.game.permanent.token;
 
 import mage.constants.CardType;
@@ -24,6 +23,8 @@ public final class Wurm1Token extends TokenImpl {
         power = new MageInt(3);
         toughness = new MageInt(3);
         this.addAbility(DeathtouchAbility.getInstance());
+
+        setTokenType(1); // for image
     }
 
     public Wurm1Token(final Wurm1Token token) {