Merge pull request #11517 from pshipton/loglevel0.24

(0.24.0) PlatformLoggingMXBean.setLoggerLevel() should allow null level
eclipse-openj9 · Dec 18, 2020 · cba9b21 · cba9b21
2 parents 37218de + 7b5e371
commit cba9b21
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/...ava.management/share/classes/com/ibm/java/lang/management/internal/LoggingMXBeanImpl.java b/...ava.management/share/classes/com/ibm/java/lang/management/internal/LoggingMXBeanImpl.java
@@ -300,13 +300,19 @@ public void setLoggerLevel(String loggerName, String levelName) {
 			// a valid level name.
 /*[IF Sidecar19-SE]*/
 			try {
-				Object newLevel = level_parse.invoke(null, levelName);
+				Object newLevel = null;
+				if (levelName != null) {
+					newLevel = level_parse.invoke(null, levelName);
+				}
 				logger_setLevel.invoke(logger, newLevel);
 			} catch (Exception e) {
 				throw handleError(e);
 			}
 /*[ELSE]*/
-			Level newLevel = Level.parse(levelName);
+			Level newLevel = null;
+			if (levelName != null) {
+				newLevel = Level.parse(levelName);
+			}
 			logger.setLevel(newLevel);
 /*[ENDIF]*/
 		} else {