[tomcat] branch master updated: Fix Graal VM check as it is static

[re...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

remm pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/master by this push:
     new 2ccf1e3  Fix Graal VM check as it is static
2ccf1e3 is described below

commit 2ccf1e3ac4a40e344e7c249f2486ed4cf4076509
Author: remm <re...@apache.org>
AuthorDate: Tue May 7 16:29:25 2019 +0200

    Fix Graal VM check as it is static
---
 java/org/apache/tomcat/util/compat/GraalCompat.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/java/org/apache/tomcat/util/compat/GraalCompat.java b/java/org/apache/tomcat/util/compat/GraalCompat.java
index 0ad3a40..f6a7fce 100644
--- a/java/org/apache/tomcat/util/compat/GraalCompat.java
+++ b/java/org/apache/tomcat/util/compat/GraalCompat.java
@@ -23,7 +23,8 @@ class GraalCompat extends JreCompat {
     private static final boolean GRAAL;
 
     static {
-        GRAAL = (System.getProperty("java.runtime.version") == null);
+        String runtime = System.getProperty("java.runtime.version");
+        GRAAL = (runtime != null && (runtime.indexOf(".buildslave.jdk8u") != -1));
     }
 
 


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org