From 7ae55e5fd1f0bcecdd5b73ebfaea7357794d0521 Mon Sep 17 00:00:00 2001 From: Ekaterina Tuzova Date: Thu, 3 Mar 2016 17:05:41 +0300 Subject: [PATCH] fixed PY-15045 Newly created cell evaluation do not remove cell from update map on empty payload. On payload is executed even on plain code evaluation --- .../plugins/ipnb/configuration/IpnbConnectionManager.java | 1 - .../org/jetbrains/plugins/ipnb/protocol/IpnbConnection.java | 3 --- 2 files changed, 4 deletions(-) diff --git a/python/ipnb/src/org/jetbrains/plugins/ipnb/configuration/IpnbConnectionManager.java b/python/ipnb/src/org/jetbrains/plugins/ipnb/configuration/IpnbConnectionManager.java index 2cdad2f5824c..c7690eb194e1 100644 --- a/python/ipnb/src/org/jetbrains/plugins/ipnb/configuration/IpnbConnectionManager.java +++ b/python/ipnb/src/org/jetbrains/plugins/ipnb/configuration/IpnbConnectionManager.java @@ -177,7 +177,6 @@ public final class IpnbConnectionManager implements ProjectComponent { if (!myUpdateMap.containsKey(parentMessageId)) return; final IpnbCodePanel cell = myUpdateMap.remove(parentMessageId); if (payload != null) { - //noinspection unchecked cell.updatePanel(payload, null); } } 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 a665ee7f2a51..e253a8b5c8b1 100644 --- a/python/ipnb/src/org/jetbrains/plugins/ipnb/protocol/IpnbConnection.java +++ b/python/ipnb/src/org/jetbrains/plugins/ipnb/protocol/IpnbConnection.java @@ -462,9 +462,6 @@ public class IpnbConnection { myListener.onPayload(payload.text, parentHeader.getMessageId()); } } - else { - myListener.onPayload(null, parentHeader.getMessageId()); - } } else if ("pyerr".equals(messageType) || "error".equals(messageType)) { final PyErrContent content = gson.fromJson(msg.getContent(), PyErrContent.class);