From b275b4e9963bc579cc076a4555b0c899df3315bb Mon Sep 17 00:00:00 2001 From: Vladimir Krivosheev Date: Thu, 24 Apr 2014 17:55:56 +0200 Subject: [PATCH] Netty channel id init is not reliable yet IDEA-124411 Netty network stuck in external make process --- jps/jps-launcher/src/org/jetbrains/jps/cmdline/Launcher.java | 4 ++-- platform/platform-impl/src/org/jetbrains/io/NettyUtil.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/jps/jps-launcher/src/org/jetbrains/jps/cmdline/Launcher.java b/jps/jps-launcher/src/org/jetbrains/jps/cmdline/Launcher.java index c97c70705317..4bbbe937d2c2 100644 --- a/jps/jps-launcher/src/org/jetbrains/jps/cmdline/Launcher.java +++ b/jps/jps-launcher/src/org/jetbrains/jps/cmdline/Launcher.java @@ -44,11 +44,11 @@ public class Launcher { final URLClassLoader jpsLoader = new URLClassLoader(urls.toArray(new URL[urls.size()]), Launcher.class.getClassLoader()); // IDEA-120811; speeding up DefaultChannelIDd calculation for netty - if (Boolean.parseBoolean(System.getProperty("io.netty.random.id"))) { + //if (Boolean.parseBoolean(System.getProperty("io.netty.random.id"))) { final String id = UUID.randomUUID().toString(); System.setProperty("io.netty.machineId", id.substring(id.length() - 8)); System.setProperty("io.netty.processId", Integer.toString(new Random().nextInt(65535))); - } + //} final Class mainClass = jpsLoader.loadClass(mainClassName); final Method mainMethod = mainClass.getMethod("main", String[].class); diff --git a/platform/platform-impl/src/org/jetbrains/io/NettyUtil.java b/platform/platform-impl/src/org/jetbrains/io/NettyUtil.java index 208c285b6b86..8a898de77a9b 100644 --- a/platform/platform-impl/src/org/jetbrains/io/NettyUtil.java +++ b/platform/platform-impl/src/org/jetbrains/io/NettyUtil.java @@ -45,7 +45,7 @@ public final class NettyUtil { static { // IDEA-120811 - if (SystemProperties.getBooleanProperty("io.netty.random.id", false)) { + if (SystemProperties.getBooleanProperty("io.netty.random.id", true)) { String id = UUID.randomUUID().toString(); System.setProperty("io.netty.machineId", id.substring(id.length() - 8)); System.setProperty("io.netty.processId", Integer.toString(new Random().nextInt(65535)));