This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.1.x by this push:
new df39a4eecb Fix NPEs if the loggers are not created somewhere before
df39a4eecb is described below
commit df39a4eecb50e832b13720c9ce510008ea8f6fc3
Author: remm <[email protected]>
AuthorDate: Thu Jun 20 11:35:25 2024 +0200
Fix NPEs if the loggers are not created somewhere before
---
test/org/apache/coyote/http2/TestFlowControl.java | 6 +++---
test/org/apache/coyote/http2/TestHttp2Section_5_1.java | 6 +++---
test/org/apache/coyote/http2/TestHttp2Section_6_1.java | 10 +++++-----
3 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/test/org/apache/coyote/http2/TestFlowControl.java
b/test/org/apache/coyote/http2/TestFlowControl.java
index 2450ffb781..362dcf40e4 100644
--- a/test/org/apache/coyote/http2/TestFlowControl.java
+++ b/test/org/apache/coyote/http2/TestFlowControl.java
@@ -19,7 +19,7 @@ package org.apache.coyote.http2;
import java.io.IOException;
import java.nio.ByteBuffer;
import java.util.logging.Level;
-import java.util.logging.LogManager;
+import java.util.logging.Logger;
import org.junit.Assert;
import org.junit.Test;
@@ -37,7 +37,7 @@ public class TestFlowControl extends Http2TestBase {
@Test
public void testNotFound() throws Exception {
-
LogManager.getLogManager().getLogger("org.apache.coyote.http2").setLevel(Level.ALL);
+ Logger.getLogger("org.apache.coyote.http2").setLevel(Level.ALL);
try {
http2Connect();
@@ -120,7 +120,7 @@ public class TestFlowControl extends Http2TestBase {
writeFrame(dataFrameHeader, dataPayload);
waitForWindowSize(0);
} finally {
-
LogManager.getLogManager().getLogger("org.apache.coyote.http2").setLevel(Level.INFO);
+ Logger.getLogger("org.apache.coyote.http2").setLevel(Level.INFO);
}
}
diff --git a/test/org/apache/coyote/http2/TestHttp2Section_5_1.java
b/test/org/apache/coyote/http2/TestHttp2Section_5_1.java
index cbe224ccfc..391ce865b1 100644
--- a/test/org/apache/coyote/http2/TestHttp2Section_5_1.java
+++ b/test/org/apache/coyote/http2/TestHttp2Section_5_1.java
@@ -18,7 +18,7 @@ package org.apache.coyote.http2;
import java.nio.ByteBuffer;
import java.util.logging.Level;
-import java.util.logging.LogManager;
+import java.util.logging.Logger;
import org.junit.Assert;
import org.junit.Test;
@@ -315,7 +315,7 @@ public class TestHttp2Section_5_1 extends Http2TestBase {
@Test
public void testErrorOnWaitingStream01() throws Exception {
-
LogManager.getLogManager().getLogger("org.apache.coyote.http2").setLevel(Level.ALL);
+ Logger.getLogger("org.apache.coyote.http2").setLevel(Level.ALL);
try {
// http2Connect() - modified
enableHttp2(1);
@@ -365,7 +365,7 @@ public class TestHttp2Section_5_1 extends Http2TestBase {
parser.readFrame();
Assert.assertEquals("3-RST-[" +
Http2Error.FLOW_CONTROL_ERROR.getCode() + "]\n", output.getTrace());
} finally {
-
LogManager.getLogManager().getLogger("org.apache.coyote.http2").setLevel(Level.INFO);
+ Logger.getLogger("org.apache.coyote.http2").setLevel(Level.INFO);
}
}
diff --git a/test/org/apache/coyote/http2/TestHttp2Section_6_1.java
b/test/org/apache/coyote/http2/TestHttp2Section_6_1.java
index bd064ae152..27c576fb4b 100644
--- a/test/org/apache/coyote/http2/TestHttp2Section_6_1.java
+++ b/test/org/apache/coyote/http2/TestHttp2Section_6_1.java
@@ -17,7 +17,7 @@
package org.apache.coyote.http2;
import java.util.logging.Level;
-import java.util.logging.LogManager;
+import java.util.logging.Logger;
import org.junit.Assert;
import org.junit.Test;
@@ -48,8 +48,8 @@ public class TestHttp2Section_6_1 extends Http2TestBase {
@Test
public void testDataFrameWithPadding() throws Exception {
-
LogManager.getLogManager().getLogger("org.apache.coyote").setLevel(Level.ALL);
-
LogManager.getLogManager().getLogger("org.apache.tomcat.util.net").setLevel(Level.ALL);
+ Logger.getLogger("org.apache.coyote").setLevel(Level.ALL);
+ Logger.getLogger("org.apache.tomcat.util.net").setLevel(Level.ALL);
try {
http2Connect();
@@ -82,8 +82,8 @@ public class TestHttp2Section_6_1 extends Http2TestBase {
"3-Header-[date]-[Wed, 11 Nov 2015 19:18:42 GMT]\n" +
"3-HeadersEnd\n" + "3-Body-119\n" +
"3-EndOfStream\n", trace);
} finally {
-
LogManager.getLogManager().getLogger("org.apache.coyote").setLevel(Level.INFO);
-
LogManager.getLogManager().getLogger("org.apache.tomcat.util.net").setLevel(Level.INFO);
+ Logger.getLogger("org.apache.coyote").setLevel(Level.INFO);
+
Logger.getLogger("org.apache.tomcat.util.net").setLevel(Level.INFO);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
