diff options
| -rw-r--r-- | src/core/lombok/core/configuration/BubblingConfigurationResolver.java | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/core/lombok/core/configuration/BubblingConfigurationResolver.java b/src/core/lombok/core/configuration/BubblingConfigurationResolver.java index c55bc75e..ecd5e397 100644 --- a/src/core/lombok/core/configuration/BubblingConfigurationResolver.java +++ b/src/core/lombok/core/configuration/BubblingConfigurationResolver.java @@ -48,12 +48,12 @@ public class BubblingConfigurationResolver implements ConfigurationResolver { public <T> T resolve(ConfigurationKey<T> key) { boolean isList = key.getType().isList(); List<List<ListModification>> listModificationsList = null; - + boolean stopBubbling = false; ConfigurationFile currentLevel = start; Collection<ConfigurationFile> visited = new HashSet<ConfigurationFile>(); outer: - while (!stopBubbling && currentLevel != null) { + while (currentLevel != null) { Deque<ConfigurationFile> round = new ArrayDeque<ConfigurationFile>(); round.push(currentLevel); @@ -70,19 +70,19 @@ public class BubblingConfigurationResolver implements ConfigurationResolver { stopBubbling = stopBubbling || (stop != null && Boolean.TRUE.equals(stop.getValue())); Result result = source.resolve(key); - if (result == null) { - continue; - } + if (result == null) continue; + if (isList) { if (listModificationsList == null) listModificationsList = new ArrayList<List<ListModification>>(); - listModificationsList.add((List<ListModification>)result.getValue()); + listModificationsList.add((List<ListModification>) result.getValue()); } if (result.isAuthoritative()) { if (isList) break outer; return (T) result.getValue(); } } - currentLevel = stopBubbling ? null : currentLevel.parent(); + if (stopBubbling) break; + currentLevel = currentLevel.parent(); } if (!isList) return null; |