From 2a24764d65a7277a980da56ac3a11b3d3c5ed965 Mon Sep 17 00:00:00 2001
From: rjenkinsjr <me@ronjenkins.info>
Date: Thu, 31 Mar 2016 21:50:19 -0400
Subject: [PATCH] Collapse level computation methods

---
 .../slf4j/impl/BukkitPluginLoggerAdapter.java | 39 +++++++------------
 1 file changed, 13 insertions(+), 26 deletions(-)

diff --git a/src/main/java/org/slf4j/impl/BukkitPluginLoggerAdapter.java b/src/main/java/org/slf4j/impl/BukkitPluginLoggerAdapter.java
index 79a4d00..dedf82b 100644
--- a/src/main/java/org/slf4j/impl/BukkitPluginLoggerAdapter.java
+++ b/src/main/java/org/slf4j/impl/BukkitPluginLoggerAdapter.java
@@ -688,12 +688,20 @@ public final class BukkitPluginLoggerAdapter extends MarkerIgnoringBase {
    *         of its ancestors define a logging level.
    */
   private Level determineCurrentLevel() {
-    final Level level = this.recursivelyComputeLevel();
-    if (level != null) {
-      return level;
-    } else {
-      return BukkitPluginLoggerAdapter.CONFIG_VALUE_DEFAULT_LOG_LEVEL;
+    // Compute the current level, which may be null.
+    String tempName = this.name;
+    Level level = null;
+    int indexOfLastDot = tempName.length();
+    while ((level == null) && (indexOfLastDot > -1)) {
+      tempName = tempName.substring(0, indexOfLastDot);
+      level = BukkitPluginLoggerAdapter.stringToLevel(BukkitPluginLoggerAdapter.getStringProperty(BukkitPluginLoggerAdapter.CONFIG_KEY_PREFIX_LOG
+                                                                                                      + tempName,
+                                                                                                  null));
+      indexOfLastDot = String.valueOf(tempName).lastIndexOf(".");
     }
+    // Return the default value if we got null.
+    return (level == null) ? BukkitPluginLoggerAdapter.CONFIG_VALUE_DEFAULT_LOG_LEVEL
+                          : level;
   }
 
   /**
@@ -901,25 +909,4 @@ public final class BukkitPluginLoggerAdapter extends MarkerIgnoringBase {
                 BukkitColorMapper.map(buf.toString()), throwable);
   }
 
-  /**
-   * Computes this logger's current logging level, based on the Bukkit plugin
-   * config.
-   * 
-   * @return null if neither this logger nor any of its ancestors define a
-   *         logging level.
-   */
-  private Level recursivelyComputeLevel() {
-    String tempName = this.name;
-    Level level = null;
-    int indexOfLastDot = tempName.length();
-    while ((level == null) && (indexOfLastDot > -1)) {
-      tempName = tempName.substring(0, indexOfLastDot);
-      level = BukkitPluginLoggerAdapter.stringToLevel(BukkitPluginLoggerAdapter.getStringProperty(BukkitPluginLoggerAdapter.CONFIG_KEY_PREFIX_LOG
-                                                                                                      + tempName,
-                                                                                                  null));
-      indexOfLastDot = String.valueOf(tempName).lastIndexOf(".");
-    }
-    return level;
-  }
-
 }