Fix DisableLoggingFeature for JBoss Threads/Hibernate/Infinispan/Webs…

…ocket-client The log level we get in beforeAnalysis may be null, in which case we still want to reset it after analysis. From the javadoc of Logger#getLevel: > Get the log Level that has been specified for this Logger. > The result may be null, which means that this logger's effective level will be inherited from its parent.
quarkusio · May 3, 2024 · 554ae55 · 554ae55
1 parent 4eaa586
commit 554ae55
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 28 deletions.
diff --git a/core/runtime/src/main/java/io/quarkus/runtime/graal/DisableLoggingFeature.java b/core/runtime/src/main/java/io/quarkus/runtime/graal/DisableLoggingFeature.java
@@ -31,10 +31,8 @@ public void beforeAnalysis(BeforeAnalysisAccess access) {
     public void afterAnalysis(AfterAnalysisAccess access) {
         for (String category : CATEGORIES) {
             Level level = categoryMap.remove(category);
-            if (level != null) {
-                Logger logger = Logger.getLogger(category);
-                logger.setLevel(level);
-            }
+            Logger logger = Logger.getLogger(category);
+            logger.setLevel(level);
         }
     }
 

diff --git a/...untime/src/main/java/io/quarkus/hibernate/envers/runtime/graal/DisableLoggingFeature.java b/...untime/src/main/java/io/quarkus/hibernate/envers/runtime/graal/DisableLoggingFeature.java
@@ -32,10 +32,8 @@ public void beforeAnalysis(BeforeAnalysisAccess access) {
     public void afterAnalysis(AfterAnalysisAccess access) {
         for (String category : CATEGORIES) {
             Level level = categoryMap.remove(category);
-            if (level != null) {
-                Logger logger = Logger.getLogger(category);
-                logger.setLevel(level);
-            }
+            Logger logger = Logger.getLogger(category);
+            logger.setLevel(level);
         }
     }
 

diff --git a/...m/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/graal/DisableLoggingFeature.java b/...m/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/graal/DisableLoggingFeature.java
@@ -34,10 +34,8 @@ public void beforeAnalysis(BeforeAnalysisAccess access) {
     public void afterAnalysis(AfterAnalysisAccess access) {
         for (String category : CATEGORIES) {
             Level level = categoryMap.remove(category);
-            if (level != null) {
-                Logger logger = Logger.getLogger(category);
-                logger.setLevel(level);
-            }
+            Logger logger = Logger.getLogger(category);
+            logger.setLevel(level);
         }
     }
 

diff --git a/...va/io/quarkus/hibernate/search/orm/elasticsearch/runtime/graal/DisableLoggingFeature.java b/...va/io/quarkus/hibernate/search/orm/elasticsearch/runtime/graal/DisableLoggingFeature.java
@@ -31,10 +31,8 @@ public void beforeAnalysis(BeforeAnalysisAccess access) {
     public void afterAnalysis(AfterAnalysisAccess access) {
         for (String category : CATEGORIES) {
             Level level = categoryMap.remove(category);
-            if (level != null) {
-                Logger logger = Logger.getLogger(category);
-                logger.setLevel(level);
-            }
+            Logger logger = Logger.getLogger(category);
+            logger.setLevel(level);
         }
     }
 

diff --git a/...r/runtime/src/main/java/io/quarkus/hibernate/validator/runtime/DisableLoggingFeature.java b/...r/runtime/src/main/java/io/quarkus/hibernate/validator/runtime/DisableLoggingFeature.java
@@ -32,10 +32,8 @@ public void beforeAnalysis(BeforeAnalysisAccess access) {
     public void afterAnalysis(AfterAnalysisAccess access) {
         for (String category : CATEGORIES) {
             Level level = categoryMap.remove(category);
-            if (level != null) {
-                Logger logger = Logger.getLogger(category);
-                logger.setLevel(level);
-            }
+            Logger logger = Logger.getLogger(category);
+            logger.setLevel(level);
         }
     }
 

diff --git a/...ntime/src/main/java/io/quarkus/infinispan/client/runtime/graal/DisableLoggingFeature.java b/...ntime/src/main/java/io/quarkus/infinispan/client/runtime/graal/DisableLoggingFeature.java
@@ -31,10 +31,8 @@ public void beforeAnalysis(BeforeAnalysisAccess access) {
     public void afterAnalysis(AfterAnalysisAccess access) {
         for (String category : CATEGORIES) {
             Level level = categoryMap.remove(category);
-            if (level != null) {
-                Logger logger = Logger.getLogger(category);
-                logger.setLevel(level);
-            }
+            Logger logger = Logger.getLogger(category);
+            logger.setLevel(level);
         }
     }
 

diff --git a/...ent/runtime/src/main/java/io/quarkus/websockets/client/runtime/DisableLoggingFeature.java b/...ent/runtime/src/main/java/io/quarkus/websockets/client/runtime/DisableLoggingFeature.java
@@ -31,10 +31,8 @@ public void beforeAnalysis(BeforeAnalysisAccess access) {
     public void afterAnalysis(AfterAnalysisAccess access) {
         for (String category : CATEGORIES) {
             Level level = categoryMap.remove(category);
-            if (level != null) {
-                Logger logger = Logger.getLogger(category);
-                logger.setLevel(level);
-            }
+            Logger logger = Logger.getLogger(category);
+            logger.setLevel(level);
         }
     }