From 270ec615af06ec85f1bce91c7e35f31e3c35b54c Mon Sep 17 00:00:00 2001
From: Oleg Agafonov <jaydi85@gmail.com>
Date: Fri, 22 Mar 2019 21:51:26 +0400
Subject: [PATCH] Sync old changes

---
 .../client/util/SoftValuesLoadingCache.java   | 11 +++++-
 .../main/java/mage/remote/SessionImpl.java    |  4 +++
 .../utils/ExportJsonGameplayDataTest.java     | 34 +++++++++++--------
 .../mage/game/permanent/token/Wurm1Token.java |  3 +-
 4 files changed, 35 insertions(+), 17 deletions(-)

diff --git a/Mage.Client/src/main/java/mage/client/util/SoftValuesLoadingCache.java b/Mage.Client/src/main/java/mage/client/util/SoftValuesLoadingCache.java
index c07fafe03e..40e1550c91 100644
--- a/Mage.Client/src/main/java/mage/client/util/SoftValuesLoadingCache.java
+++ b/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,7 +37,14 @@ public class SoftValuesLoadingCache<K, V> extends ForwardingLoadingCache<K, Opti
         try {
             return get(key).orElse(null);
         } catch (ExecutionException e) {
-            throw new RuntimeException(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;
         }
     }
 
diff --git a/Mage.Common/src/main/java/mage/remote/SessionImpl.java b/Mage.Common/src/main/java/mage/remote/SessionImpl.java
index bd88ebdee5..394f5c910f 100644
--- a/Mage.Common/src/main/java/mage/remote/SessionImpl.java
+++ b/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);
diff --git a/Mage.Tests/src/test/java/org/mage/test/utils/ExportJsonGameplayDataTest.java b/Mage.Tests/src/test/java/org/mage/test/utils/ExportJsonGameplayDataTest.java
index b076f71635..67ef4b6431 100644
--- a/Mage.Tests/src/test/java/org/mage/test/utils/ExportJsonGameplayDataTest.java
+++ b/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,21 +117,24 @@ public class ExportJsonGameplayDataTest {
 
             Gson gson = new GsonBuilder().setPrettyPrinting().create();
 
-            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(
-                                         new FileOutputStream(outputFile, false), StandardCharsets.UTF_8
-                                 )
-                         )
-            ) {
-                writer.write(gson.toJson(res));
-                System.out.println("Wrote " + set.getCode() + " to file");
-            } catch (Exception e) {
-                e.printStackTrace();
+            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(
+                                             new FileOutputStream(outputFile, false), StandardCharsets.UTF_8
+                                     )
+                             )
+                ) {
+                    writer.write(gson.toJson(res));
+                    System.out.println("Wrote " + set.getCode() + " to file");
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+            } else {
+                //System.out.println(gson.toJson(res));
             }
         }
     }
diff --git a/Mage/src/main/java/mage/game/permanent/token/Wurm1Token.java b/Mage/src/main/java/mage/game/permanent/token/Wurm1Token.java
index da2bc1764c..85d0116826 100644
--- a/Mage/src/main/java/mage/game/permanent/token/Wurm1Token.java
+++ b/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) {