This is an automated email from the ASF dual-hosted git repository.
fhanik 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 b1820ad Allow detection of Graal via reflection or system property
b1820ad is described below
commit b1820ad16b41671c265c7194deb0d723d9c34ac9
Author: Filip Hanik <[email protected]>
AuthorDate: Thu Jul 23 15:41:16 2020 -0700
Allow detection of Graal via reflection or system property
---
java/org/apache/jasper/runtime/JspRuntimeLibrary.java | 2 +-
java/org/apache/naming/NamingContext.java | 2 +-
java/org/apache/tomcat/util/compat/GraalCompat.java | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/java/org/apache/jasper/runtime/JspRuntimeLibrary.java
b/java/org/apache/jasper/runtime/JspRuntimeLibrary.java
index cfb6e75..73b149f 100644
--- a/java/org/apache/jasper/runtime/JspRuntimeLibrary.java
+++ b/java/org/apache/jasper/runtime/JspRuntimeLibrary.java
@@ -69,7 +69,7 @@ public class JspRuntimeLibrary {
} catch (ReflectiveOperationException | IllegalArgumentException e) {
// Should never happen
}
- GRAAL = result;
+ GRAAL = result ||
System.getProperty("org.graalvm.nativeimage.imagecode") != null;
}
/**
diff --git a/java/org/apache/naming/NamingContext.java
b/java/org/apache/naming/NamingContext.java
index 0471279..a064421 100644
--- a/java/org/apache/naming/NamingContext.java
+++ b/java/org/apache/naming/NamingContext.java
@@ -804,7 +804,7 @@ public class NamingContext implements Context {
} catch (ReflectiveOperationException | IllegalArgumentException e) {
// Should never happen
}
- GRAAL = result;
+ GRAAL = result ||
System.getProperty("org.graalvm.nativeimage.imagecode") != null;
}
/**
diff --git a/java/org/apache/tomcat/util/compat/GraalCompat.java
b/java/org/apache/tomcat/util/compat/GraalCompat.java
index 9fb835a..6187eb6 100644
--- a/java/org/apache/tomcat/util/compat/GraalCompat.java
+++ b/java/org/apache/tomcat/util/compat/GraalCompat.java
@@ -32,7 +32,7 @@ class GraalCompat extends Jre9Compat {
} catch (ReflectiveOperationException | IllegalArgumentException e) {
// Should never happen
}
- GRAAL = result;
+ GRAAL = result ||
System.getProperty("org.graalvm.nativeimage.imagecode") != null;
}
static boolean isSupported() {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
