This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/9.0.x by this push:
new 70dd59af27 Code clean-up - formatting. No functional change.
70dd59af27 is described below
commit 70dd59af2767d5f973eb9172ef78903f34c65992
Author: Mark Thomas <[email protected]>
AuthorDate: Fri Feb 21 17:35:50 2025 +0000
Code clean-up - formatting. No functional change.
---
java/org/apache/tomcat/util/compat/Jre12Compat.java | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/java/org/apache/tomcat/util/compat/Jre12Compat.java
b/java/org/apache/tomcat/util/compat/Jre12Compat.java
index fee0a17027..640f393019 100644
--- a/java/org/apache/tomcat/util/compat/Jre12Compat.java
+++ b/java/org/apache/tomcat/util/compat/Jre12Compat.java
@@ -132,15 +132,18 @@ public class Jre12Compat extends Jre9Compat {
* the attempt to set the 'useCanonCaches' field to fail.
Users that really want to use Java 18 to 20
* will have to ensure that they do not explicitly enable the
canonical file name cache.
*/
- Method privateLookupInMethod =
MethodHandles.class.getDeclaredMethod("privateLookupIn", Class.class,
Lookup.class);
- Method findVarHandleMethod =
Lookup.class.getDeclaredMethod("findVarHandle", Class.class, String.class,
Class.class);
+ Method privateLookupInMethod =
+
MethodHandles.class.getDeclaredMethod("privateLookupIn", Class.class,
Lookup.class);
+ Method findVarHandleMethod =
+ Lookup.class.getDeclaredMethod("findVarHandle",
Class.class, String.class, Class.class);
clazz = Class.forName("java.lang.invoke.VarHandle");
Lookup lookup = (Lookup) privateLookupInMethod.invoke(null,
Field.class, MethodHandles.lookup());
Object modifiers = findVarHandleMethod.invoke(lookup,
Field.class, "modifiers", int.class);
Method setMethod = null;
try {
- setMethod = modifiers.getClass().getDeclaredMethod("set",
modifiers.getClass(), Object.class, int.class);
+ setMethod = modifiers.getClass().getDeclaredMethod("set",
modifiers.getClass(), Object.class,
+ int.class);
} catch (NoSuchMethodException e) {
/*
* Method signature changed between Java 14 and Java 15.
This hack avoids creating Jre15Compat for
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
