From f7de91a0b958c285d330649b58abea0cd4358ed6 Mon Sep 17 00:00:00 2001
From: Henning Andersen <33268011+henningandersen@users.noreply.github.com>
Date: Thu, 23 Jan 2020 11:25:19 +0100
Subject: [PATCH] Revert "Workaround for JDK 14 EA FileChannel.map issue
 (#50523)" (#51323)

This reverts commit c7fd24ca1569a809b499caf34077599e463bb8d6.

Now that JDK-8236582 is fixed in JDK 14 EA, we can revert the workaround.

Relates #50523 and #50512
---
 .../elasticsearch/bootstrap/Bootstrap.java    | 24 ++-----------------
 .../bootstrap/BootstrapForTesting.java        |  2 --
 2 files changed, 2 insertions(+), 24 deletions(-)

diff --git a/server/src/main/java/org/elasticsearch/bootstrap/Bootstrap.java b/server/src/main/java/org/elasticsearch/bootstrap/Bootstrap.java
index 32d1a4d0d0de3..6b5896ac8d493 100644
--- a/server/src/main/java/org/elasticsearch/bootstrap/Bootstrap.java
+++ b/server/src/main/java/org/elasticsearch/bootstrap/Bootstrap.java
@@ -19,13 +19,14 @@
 
 package org.elasticsearch.bootstrap;
 
-import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.core.Appender;
 import org.apache.logging.log4j.core.LoggerContext;
 import org.apache.logging.log4j.core.appender.ConsoleAppender;
 import org.apache.logging.log4j.core.config.Configurator;
 import org.apache.lucene.util.Constants;
+import org.elasticsearch.core.internal.io.IOUtils;
 import org.apache.lucene.util.StringHelper;
 import org.elasticsearch.ElasticsearchException;
 import org.elasticsearch.Version;
@@ -41,7 +42,6 @@
 import org.elasticsearch.common.settings.SecureSettings;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.transport.BoundTransportAddress;
-import org.elasticsearch.core.internal.io.IOUtils;
 import org.elasticsearch.env.Environment;
 import org.elasticsearch.monitor.jvm.JvmInfo;
 import org.elasticsearch.monitor.os.OsProbe;
@@ -160,24 +160,6 @@ static void initializeProbes() {
         JvmInfo.jvmInfo();
     }
 
-    /**
-     * JDK 14 bug:
-     * https://github.com/elastic/elasticsearch/issues/50512
-     * We circumvent it here by loading the offending class before installing security manager.
-     *
-     * To be removed once the JDK is fixed.
-     */
-    static void fixJDK14EAFileChannelMap() {
-        // minor time-bomb here to ensure that we reevaluate if final 14 version does not include fix.
-        if (System.getProperty("java.version").equals("14-ea")) {
-            try {
-                Class.forName("jdk.internal.misc.ExtendedMapMode", true, Bootstrap.class.getClassLoader());
-            } catch (ClassNotFoundException e) {
-                throw new RuntimeException("Unable to lookup ExtendedMapMode class", e);
-            }
-        }
-    }
-
     private void setup(boolean addShutdownHook, Environment environment) throws BootstrapException {
         Settings settings = environment.settings();
 
@@ -229,8 +211,6 @@ public void run() {
         // Log ifconfig output before SecurityManager is installed
         IfConfig.logIfNecessary();
 
-        fixJDK14EAFileChannelMap();
-
         // install SM after natives, shutdown hooks, etc.
         try {
             Security.configure(environment, BootstrapSettings.SECURITY_FILTER_BAD_DEFAULTS_SETTING.get(settings));
diff --git a/test/framework/src/main/java/org/elasticsearch/bootstrap/BootstrapForTesting.java b/test/framework/src/main/java/org/elasticsearch/bootstrap/BootstrapForTesting.java
index c67eea7524951..e035b779b3f02 100644
--- a/test/framework/src/main/java/org/elasticsearch/bootstrap/BootstrapForTesting.java
+++ b/test/framework/src/main/java/org/elasticsearch/bootstrap/BootstrapForTesting.java
@@ -102,8 +102,6 @@ public class BootstrapForTesting {
         // Log ifconfig output before SecurityManager is installed
         IfConfig.logIfNecessary();
 
-        Bootstrap.fixJDK14EAFileChannelMap();
-
         // install security manager if requested
         if (systemPropertyAsBoolean("tests.security.manager", true)) {
             try {