From 415a875dfc615dc6ac4c7c35c34f3a4902fc1783 Mon Sep 17 00:00:00 2001 From: Nikolay Martynov Date: Tue, 5 Nov 2019 13:02:18 -0500 Subject: [PATCH] Add generic is-before-java9 check --- .../src/main/java/datadog/trace/agent/TracingAgent.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dd-java-agent/src/main/java/datadog/trace/agent/TracingAgent.java b/dd-java-agent/src/main/java/datadog/trace/agent/TracingAgent.java index 4f79e78d35..b2c09c67fd 100644 --- a/dd-java-agent/src/main/java/datadog/trace/agent/TracingAgent.java +++ b/dd-java-agent/src/main/java/datadog/trace/agent/TracingAgent.java @@ -268,8 +268,7 @@ public class TracingAgent { private static ClassLoader createDatadogClassLoader( final String innerJarFilename, final URL bootstrapURL) throws Exception { final ClassLoader agentParent; - final String javaVersion = System.getProperty("java.version"); - if (javaVersion.startsWith("1.7") || javaVersion.startsWith("1.8")) { + if (isJavaBefore9()) { agentParent = null; // bootstrap } else { // platform classloader is parent of system in java 9+ @@ -375,6 +374,10 @@ public class TracingAgent { return false; } + private static boolean isJavaBefore9() { + return System.getProperty("java.version").startsWith("1."); + } + /** * Main entry point. *