From dbed24a2f4debf0c2be0e0a897c2dc13713413b1 Mon Sep 17 00:00:00 2001
From: kylixs <kylixs@qq.com>
Date: Mon, 23 Mar 2020 15:56:48 +0800
Subject: [PATCH] removing dependency ShellServer from Session

---
 .../arthas/core/command/basic1000/ShutdownCommand.java    | 4 +++-
 .../com/taobao/arthas/core/server/ArthasBootstrap.java    | 4 ++++
 .../com/taobao/arthas/core/shell/session/Session.java     | 8 +-------
 .../arthas/core/shell/session/impl/SessionImpl.java       | 6 ------
 4 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/core/src/main/java/com/taobao/arthas/core/command/basic1000/ShutdownCommand.java b/core/src/main/java/com/taobao/arthas/core/command/basic1000/ShutdownCommand.java
index 7fc2bd63c..c1cfc2e65 100644
--- a/core/src/main/java/com/taobao/arthas/core/command/basic1000/ShutdownCommand.java
+++ b/core/src/main/java/com/taobao/arthas/core/command/basic1000/ShutdownCommand.java
@@ -1,6 +1,7 @@
 package com.taobao.arthas.core.command.basic1000;
 
 import com.taobao.arthas.core.advisor.Enhancer;
+import com.taobao.arthas.core.server.ArthasBootstrap;
 import com.taobao.arthas.core.shell.ShellServer;
 import com.taobao.arthas.core.shell.command.AnnotatedCommand;
 import com.taobao.arthas.core.shell.command.CommandProcess;
@@ -39,7 +40,8 @@ public class ShutdownCommand extends AnnotatedCommand {
             // ignore
         } finally {
             process.end();
-            ShellServer server = process.session().getServer();
+            //ShellServer server = process.session().getServer();
+            ShellServer server = ArthasBootstrap.getInstance().getShellServer();
             server.close();
         }
     }
diff --git a/core/src/main/java/com/taobao/arthas/core/server/ArthasBootstrap.java b/core/src/main/java/com/taobao/arthas/core/server/ArthasBootstrap.java
index 3bf10784d..574833fad 100644
--- a/core/src/main/java/com/taobao/arthas/core/server/ArthasBootstrap.java
+++ b/core/src/main/java/com/taobao/arthas/core/server/ArthasBootstrap.java
@@ -357,4 +357,8 @@ public class ArthasBootstrap {
     public TunnelClient getTunnelClient() {
         return tunnelClient;
     }
+
+    public ShellServer getShellServer() {
+        return shellServer;
+    }
 }
diff --git a/core/src/main/java/com/taobao/arthas/core/shell/session/Session.java b/core/src/main/java/com/taobao/arthas/core/shell/session/Session.java
index 5242a684e..5166e8a6b 100644
--- a/core/src/main/java/com/taobao/arthas/core/shell/session/Session.java
+++ b/core/src/main/java/com/taobao/arthas/core/shell/session/Session.java
@@ -10,6 +10,7 @@ import java.util.List;
  * A shell session.
  *
  * @author <a href="mailto:julien@julienviet.com">Julien Viet</a>
+ * @author gongdewei 2020-03-23
  */
 public interface Session {
     String COMMAND_MANAGER = "arthas-command-manager";
@@ -80,13 +81,6 @@ public interface Session {
      */
     String getSessionId();
 
-    /**
-     * Get shell server
-     *
-     * @return shell server
-     */
-    ShellServer getServer();
-
     /**
      * Get Java PID
      *
diff --git a/core/src/main/java/com/taobao/arthas/core/shell/session/impl/SessionImpl.java b/core/src/main/java/com/taobao/arthas/core/shell/session/impl/SessionImpl.java
index a0a10497c..a93931b04 100644
--- a/core/src/main/java/com/taobao/arthas/core/shell/session/impl/SessionImpl.java
+++ b/core/src/main/java/com/taobao/arthas/core/shell/session/impl/SessionImpl.java
@@ -1,6 +1,5 @@
 package com.taobao.arthas.core.shell.session.impl;
 
-import com.taobao.arthas.core.shell.ShellServer;
 import com.taobao.arthas.core.shell.command.CommandResolver;
 import com.taobao.arthas.core.shell.session.Session;
 import com.taobao.arthas.core.shell.system.impl.InternalCommandManager;
@@ -69,11 +68,6 @@ public class SessionImpl implements Session {
         return (String) data.get(ID);
     }
 
-    @Override
-    public ShellServer getServer() {
-        return (ShellServer) data.get(SERVER);
-    }
-
     @Override
     public long getPid() {
         return (Long) data.get(PID);