From 421efd0bd5b585cc2240835e45a53f7c105d11e0 Mon Sep 17 00:00:00 2001 From: Vladimir Krivosheev Date: Mon, 12 May 2014 11:00:26 +0200 Subject: [PATCH] =?UTF-8?q?we=20must=20avoid=20use=20UUID.randomUUID=20?= =?UTF-8?q?=E2=80=94=20can=20cause=20long=20network=20calls?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/org/jetbrains/jps/cmdline/Launcher.java | 8 +++++--- .../platform-impl/src/org/jetbrains/io/NettyUtil.java | 4 +--- 2 files changed, 6 insertions(+), 6 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 4bbbe937d2c2..1fa208092696 100644 --- a/jps/jps-launcher/src/org/jetbrains/jps/cmdline/Launcher.java +++ b/jps/jps-launcher/src/org/jetbrains/jps/cmdline/Launcher.java @@ -21,7 +21,10 @@ import java.lang.reflect.Method; import java.net.MalformedURLException; import java.net.URL; import java.net.URLClassLoader; -import java.util.*; +import java.util.ArrayList; +import java.util.List; +import java.util.Random; +import java.util.StringTokenizer; /** * @author Eugene Zhuravlev @@ -45,8 +48,7 @@ public class Launcher { // IDEA-120811; speeding up DefaultChannelIDd calculation for netty //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.machineId", "9e43d860"); System.setProperty("io.netty.processId", Integer.toString(new Random().nextInt(65535))); //} diff --git a/platform/platform-impl/src/org/jetbrains/io/NettyUtil.java b/platform/platform-impl/src/org/jetbrains/io/NettyUtil.java index 9dc1e4255400..e9d1cdf0c67b 100644 --- a/platform/platform-impl/src/org/jetbrains/io/NettyUtil.java +++ b/platform/platform-impl/src/org/jetbrains/io/NettyUtil.java @@ -37,7 +37,6 @@ import java.net.BindException; import java.net.InetSocketAddress; import java.net.Socket; import java.util.Random; -import java.util.UUID; public final class NettyUtil { public static final int DEFAULT_CONNECT_ATTEMPT_COUNT = 20; @@ -46,8 +45,7 @@ public final class NettyUtil { static { // IDEA-120811 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.machineId", "9e43d860"); System.setProperty("io.netty.processId", Integer.toString(new Random().nextInt(65535))); } }