Issue #4830 - Add JMX to new Jetty 10 jetty-slf4j-impl.

Updates after review. Fixed test failures. Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
jetty · May 3, 2020 · f98e2f8 · f98e2f8
1 parent d239920
commit f98e2f8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/jetty-jmx/src/main/java/org/eclipse/jetty/jmx/MBeanContainer.java b/jetty-jmx/src/main/java/org/eclipse/jetty/jmx/MBeanContainer.java
@@ -172,7 +172,7 @@ static Object mbeanFor(MBeanContainer container, Object o)
             }
             klass = klass.getSuperclass();
         }
-        Object mbean = findMetaData(container, klass).newInstance(o);
+        Object mbean = findMetaData(container, o.getClass()).newInstance(o);
         if (mbean instanceof ObjectMBean)
             ((ObjectMBean)mbean).setMBeanContainer(container);
         if (LOG.isDebugEnabled())

diff --git a/jetty-slf4j-impl/src/main/java/org/eclipse/jetty/logging/JettyLoggerFactory.java b/jetty-slf4j-impl/src/main/java/org/eclipse/jetty/logging/JettyLoggerFactory.java
@@ -130,7 +130,8 @@ static <T> T walkParentLoggerNames(String startName, Function<String, T> nameFun
             else
                 break;
         }
-        return null;
+
+        return nameFunction.apply(Logger.ROOT_LOGGER_NAME);
     }
 
     @Override
-Original file line number
+Diff line change
@@ Expand Up @@
                 else
                     break;
             }
-            return null;
+            return nameFunction.apply(Logger.ROOT_LOGGER_NAME);
         }
         @Override
@@ Expand Down @@