From 140f9d27110bfcda84d1f76814a9b48b604d82d4 Mon Sep 17 00:00:00 2001 From: Vladimir Krivosheev Date: Wed, 15 Jun 2016 12:31:18 +0300 Subject: [PATCH] [platform] activation protocol quick fix (IDEA-CR-11401) --- platform/platform-impl/src/com/intellij/idea/SocketLock.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/platform/platform-impl/src/com/intellij/idea/SocketLock.java b/platform/platform-impl/src/com/intellij/idea/SocketLock.java index 65082b74d3d8..4851e2a63ee9 100644 --- a/platform/platform-impl/src/com/intellij/idea/SocketLock.java +++ b/platform/platform-impl/src/com/intellij/idea/SocketLock.java @@ -370,7 +370,8 @@ public final class SocketLock { } if (StringUtil.startsWith(command, ACTIVATE_COMMAND)) { - List args = StringUtil.split(command.subSequence(ACTIVATE_COMMAND.length(), command.length()).toString(), "\0"); + String data = command.subSequence(ACTIVATE_COMMAND.length(), command.length()).toString(); + List args = StringUtil.split(data, data.contains("\0") ? "\0" : "\uFFFD"); boolean tokenOK = !args.isEmpty() && myToken.equals(args.get(0)); if (!tokenOK) { -- 2.32.0