Test failure with java-21 on LogManagerPropertiesTest jakartaee#700

Signed-off-by: jmehrens <[email protected]>
jmehrens · Jan 25, 2024 · be63572 · be63572
1 parent 1f24e8b
commit be63572
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 29 deletions.
diff --git a/doc/release/CHANGES.txt b/doc/release/CHANGES.txt
@@ -19,6 +19,12 @@ Bug IDs that start with "G" can be found in the GlassFish Issue Tracker
 Seven digit bug numbers are from the old Sun bug database, which is no
 longer available.
 
+		  CHANGES IN THE 1.6.8 RELEASE
+		  ----------------------------
+The following bugs have been fixed in the 1.6.8 release.
+
+E  700  Test failure with java-21 on LogManagerPropertiesTest
+
 
 		  CHANGES IN THE 1.6.7 RELEASE
 		  ----------------------------
@@ -27,7 +33,6 @@ The following bugs have been fixed in the 1.6.7 release.
 E  528	CompactFormatter precision and surrogate pairs
 E  529	CompactFormatter support for LogRecord::getLongThreadID
 E  535	The final release of 1.6.6 identifies itself as 1.6.6-SNAPSHOT.
-E  700  Test failure with java-21 on LogManagerPropertiesTest
 
 
 		  CHANGES IN THE 1.6.6 RELEASE

diff --git a/mail/src/main/java/com/sun/mail/util/logging/LogManagerProperties.java b/mail/src/main/java/com/sun/mail/util/logging/LogManagerProperties.java
@@ -899,7 +899,7 @@ public ClassLoader[] run() {
      * @return the result.
      * @throws NullPointerException if the given action is null.
      * @throws UndeclaredThrowableException if a checked exception is thrown.
-     * @since JavaMail 1.6.7
+     * @since JavaMail 1.6.8
      */
     static <T> T runOrDoPrivileged(final PrivilegedAction<T> a) {
         if (a == null) {
@@ -921,7 +921,7 @@ static <T> T runOrDoPrivileged(final PrivilegedAction<T> a) {
      * @return the result.
      * @throws UnsupportedOperationException if not allowed.
      * @throws UndeclaredThrowableException if a checked exception is thrown.
-     * @since JavaMail 1.6.7
+     * @since JavaMail 1.6.8
      */
     @SuppressWarnings("unchecked")
     private static <T> T invokeAccessController(final PrivilegedAction<T> a) {

diff --git a/mail/src/test/java/com/sun/mail/util/logging/MailHandlerTest.java b/mail/src/test/java/com/sun/mail/util/logging/MailHandlerTest.java
@@ -92,14 +92,6 @@ public static void tearDownClass() throws Exception {
         anyClassPathDir = null;
     }
 
-    private static void assumeNoJit() {
-        CompilationMXBean c = ManagementFactory.getCompilationMXBean();
-        if (c != null) { //-Xint
-            Assume.assumeNoException(new IllegalArgumentException(
-                    c.getName() + " must be disabled."));
-        }
-    }
-
     private static void fullFence() {
         LogManager.getLogManager().getProperty("");
     }
@@ -155,24 +147,6 @@ private static void setPending(final Throwable t) {
         }
     }
 
-    private static Field setAccessible(Field f) {
-        f.setAccessible(true);
-        try {
-            assumeNoJit();
-            if (Modifier.isFinal(f.getModifiers())) {
-                Field mod = Field.class.getDeclaredField("modifiers");
-                mod.setAccessible(true);
-                mod.setInt(f, f.getModifiers() & ~Modifier.FINAL);
-                return mod;
-            }
-        } catch (RuntimeException re) {
-            Assume.assumeNoException(re);
-        } catch (Exception e) {
-            Assume.assumeNoException(e);
-        }
-        throw new AssertionError();
-    }
-
     private static void set(ClassLoader expect) {
         if (expect == null) {
             LOADER.remove();