From b58d4a4734855fdf7cf0ee5079a248baefefb787 Mon Sep 17 00:00:00 2001
From: Valentina Kiryushkina <valentina.kiryushkina@jetbrains.com>
Date: Fri, 3 Feb 2017 13:34:41 +0300
Subject: [PATCH] PY-22558 Shutdown kernels for hub correctly

---
 .../jetbrains/plugins/ipnb/protocol/IpnbConnection.java    | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/python/ipnb/src/org/jetbrains/plugins/ipnb/protocol/IpnbConnection.java b/python/ipnb/src/org/jetbrains/plugins/ipnb/protocol/IpnbConnection.java
index 37635c1b7f55..0051603b9d21 100644
--- a/python/ipnb/src/org/jetbrains/plugins/ipnb/protocol/IpnbConnection.java
+++ b/python/ipnb/src/org/jetbrains/plugins/ipnb/protocol/IpnbConnection.java
@@ -416,7 +416,12 @@ public class IpnbConnection {
   }
 
   protected void shutdownKernel() throws IOException {
-    httpRequest(myURI + KERNELS_URL + "/" + myKernelId, HTTPMethod.DELETE.name());
+    if (myIsHubServer) {
+      httpRequest(myURI + USER_PATH + "/" + IpnbSettings.getInstance(myProject).getUsername() + KERNELS_URL + "/" + myKernelId,  HTTPMethod.DELETE.name());
+    }
+    else {
+      httpRequest(myURI + KERNELS_URL + "/" + myKernelId, HTTPMethod.DELETE.name());
+    }
   }
 
   public void interrupt() throws IOException {