From 8ac8d36c03a46c3991357049b3686d009d8ddb13 Mon Sep 17 00:00:00 2001
From: LevelX2 <ludwig.hirth@online.de>
Date: Thu, 2 Oct 2014 01:14:32 +0200
Subject: [PATCH] * Some connection handling changes.

---
 Mage.Client/src/main/java/mage/client/MageFrame.java          | 4 +++-
 .../java/mage/client/plugins/adapters/MageActionCallback.java | 2 +-
 Mage.Common/src/mage/remote/SessionImpl.java                  | 4 ++--
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/Mage.Client/src/main/java/mage/client/MageFrame.java b/Mage.Client/src/main/java/mage/client/MageFrame.java
index d2448455b64..7217f2672e8 100644
--- a/Mage.Client/src/main/java/mage/client/MageFrame.java
+++ b/Mage.Client/src/main/java/mage/client/MageFrame.java
@@ -1232,7 +1232,7 @@ public class MageFrame extends javax.swing.JFrame implements MageClient {
     @Override
     public void disconnected(final boolean errorCall) {
         if (SwingUtilities.isEventDispatchThread()) { // Returns true if the current thread is an AWT event dispatching thread.
-            logger.info("DISCONNECTED (Event Dispacth Thread)");
+            logger.info("DISCONNECTED (Event Dispatch Thread)");
             setStatusText("Not connected");
             disableButtons();
             hideGames();
@@ -1250,6 +1250,8 @@ public class MageFrame extends javax.swing.JFrame implements MageClient {
                         if (performConnect()) {
                             enableButtons();
                         }
+                    } else {
+                        session.disconnect(false);
                     }
                 }
             });
diff --git a/Mage.Client/src/main/java/mage/client/plugins/adapters/MageActionCallback.java b/Mage.Client/src/main/java/mage/client/plugins/adapters/MageActionCallback.java
index bf5eeda1d59..6a7f024aec2 100644
--- a/Mage.Client/src/main/java/mage/client/plugins/adapters/MageActionCallback.java
+++ b/Mage.Client/src/main/java/mage/client/plugins/adapters/MageActionCallback.java
@@ -305,7 +305,7 @@ public class MageActionCallback implements ActionCallback {
     }
 
     private void sort(CardPanel card, JPanel container, boolean sortSource) {
-        java.util.List<CardPanel> cards = new ArrayList<CardPanel>();
+        java.util.List<CardPanel> cards = new ArrayList<>();
         for (Component component : container.getComponents()) {
             if (component instanceof CardPanel) {
                 if (!component.equals(card)) {
diff --git a/Mage.Common/src/mage/remote/SessionImpl.java b/Mage.Common/src/mage/remote/SessionImpl.java
index 0bcace8817d..c7d29158c08 100644
--- a/Mage.Common/src/mage/remote/SessionImpl.java
+++ b/Mage.Common/src/mage/remote/SessionImpl.java
@@ -251,8 +251,8 @@ public class SessionImpl implements Session {
                 listenerMetadata.put(ConnectionValidator.VALIDATOR_PING_PERIOD, "1000000");
                 listenerMetadata.put(ConnectionValidator.VALIDATOR_PING_TIMEOUT, "900000");
             } else {
-                listenerMetadata.put(ConnectionValidator.VALIDATOR_PING_PERIOD, "10000");
-                listenerMetadata.put(ConnectionValidator.VALIDATOR_PING_TIMEOUT, "9000");
+                listenerMetadata.put(ConnectionValidator.VALIDATOR_PING_PERIOD, "15000");
+                listenerMetadata.put(ConnectionValidator.VALIDATOR_PING_TIMEOUT, "13000");
             }
             callbackClient.connect(new ClientConnectionListener(), listenerMetadata);