Rebase to eclipse/master

Signed-off-by: David Matějček <david.matejcek@omnifish.ee> # Conflicts: # appserver/tests/testcontainers/pom.xml # appserver/tests/testcontainers/src/test/java/org/glassfish/main/test/tc/GlassFishContainer.java
eclipse-ee4j · Feb 20, 2024 · 5db076f · 5db076f
1 parent 73bbe70
commit 5db076f
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 29 deletions.
diff --git a/...rver/tests/admin/tests/src/test/java/org/glassfish/main/admin/test/rest/RestTestBase.java b/...rver/tests/admin/tests/src/test/java/org/glassfish/main/admin/test/rest/RestTestBase.java
@@ -17,12 +17,13 @@
 
 package org.glassfish.main.admin.test.rest;
 
+import com.sun.enterprise.util.io.FileUtils;
+
 import jakarta.ws.rs.client.Client;
 import jakarta.ws.rs.core.MultivaluedMap;
 import jakarta.ws.rs.core.Response;
 
 import java.io.File;
-import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.ArrayList;
@@ -45,7 +46,6 @@
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.TestInfo;
 
-import static com.sun.enterprise.util.io.FileUtils.copy;
 import static com.sun.enterprise.util.io.FileUtils.ensureWritableDir;
 import static jakarta.ws.rs.core.MediaType.TEXT_PLAIN;
 import static org.glassfish.main.itest.tools.GlassFishTestEnvironment.getTargetDirectory;
@@ -95,7 +95,7 @@ public static void captureLogAndCloseClient(final TestInfo testInfo) throws Exce
             ensureWritableDir(reportDir);
 
             File reportFile = new File(reportDir, testInfo.getTestClass().orElseThrow().getName() + "-server.log");
-            copy(response.readEntity(InputStream.class), new FileOutputStream(reportFile), Long.MAX_VALUE);
+            FileUtils.copy(response.readEntity(InputStream.class), reportFile, Long.MAX_VALUE);
         }
     }
 

diff --git a/appserver/tests/jakartaee/pom.xml b/appserver/tests/jakartaee/pom.xml
diff --git a/nucleus/common/common-util/src/main/java/com/sun/enterprise/loader/ASURLClassLoader.java b/nucleus/common/common-util/src/main/java/com/sun/enterprise/loader/ASURLClassLoader.java
@@ -153,8 +153,8 @@ public boolean isClosed() {
     public void preDestroy() {
         try {
             close();
-        } catch(IOException ioe) {
-            _logger.log(INFO, CULoggerInfo.getString(CULoggerInfo.exceptionIO), ioe);
+        } catch (IOException ioe) {
+            _logger.log(Level.SEVERE, "Could not close the classloader " + this, ioe);
         }
     }
 

diff --git a/nucleus/common/common-util/src/main/java/com/sun/enterprise/util/CULoggerInfo.java b/nucleus/common/common-util/src/main/java/com/sun/enterprise/util/CULoggerInfo.java
@@ -54,13 +54,6 @@ public static String getString(String key, Object... args) {
         return MessageFormat.format(getString(key), args);
     }
 
-    @LogMessageInfo(
-            message = "Some IOException occurred",
-            cause = "An unexpected exception occurred.",
-            action = "Check the system logs and contact Oracle support.",
-            level = "SEVERE")
-    public static final String exceptionIO = LOGMSG_PREFIX + "-00031";
-
     @LogMessageInfo(
             message = "Failed to process class {0} with bytecode preprocessor {1}",
             cause = "Unknown",