|
31 | 31 | import org.apache.log4j.helpers.AppenderAttachableImpl; |
32 | 32 | import org.apache.log4j.helpers.NullEnumeration; |
33 | 33 | import org.apache.log4j.legacy.core.CategoryUtil; |
34 | | -import org.apache.log4j.or.ObjectRenderer; |
35 | | -import org.apache.log4j.or.RendererMap; |
36 | 34 | import org.apache.log4j.spi.AppenderAttachable; |
37 | 35 | import org.apache.log4j.spi.HierarchyEventListener; |
38 | 36 | import org.apache.log4j.spi.LoggerRepository; |
@@ -145,8 +143,6 @@ public static void shutdown() { |
145 | 143 | */ |
146 | 144 | volatile protected Level level; |
147 | 145 |
|
148 | | - private RendererMap rendererMap; |
149 | | - |
150 | 146 | /** |
151 | 147 | * The parent of this category. All categories have at least one ancestor which is the root category. |
152 | 148 | */ |
@@ -345,21 +341,6 @@ public void forcedLog(final String fqcn, final Priority level, final Object mess |
345 | 341 | } |
346 | 342 | } |
347 | 343 |
|
348 | | - private <T> ObjectRenderer get(final Class<T> clazz) { |
349 | | - ObjectRenderer renderer = null; |
350 | | - for (Class<? super T> c = clazz; c != null; c = c.getSuperclass()) { |
351 | | - renderer = rendererMap.get(c); |
352 | | - if (renderer != null) { |
353 | | - return renderer; |
354 | | - } |
355 | | - renderer = searchInterfaces(c); |
356 | | - if (renderer != null) { |
357 | | - return renderer; |
358 | | - } |
359 | | - } |
360 | | - return null; |
361 | | - } |
362 | | - |
363 | 344 | public boolean getAdditivity() { |
364 | 345 | return LogManager.isLog4jCorePresent() ? CategoryUtil.isAdditive(logger) : false; |
365 | 346 | } |
@@ -653,21 +634,6 @@ public void removeAppender(final String name) { |
653 | 634 | } |
654 | 635 | } |
655 | 636 |
|
656 | | - ObjectRenderer searchInterfaces(final Class<?> c) { |
657 | | - ObjectRenderer renderer = rendererMap.get(c); |
658 | | - if (renderer != null) { |
659 | | - return renderer; |
660 | | - } |
661 | | - final Class<?>[] ia = c.getInterfaces(); |
662 | | - for (final Class<?> clazz : ia) { |
663 | | - renderer = searchInterfaces(clazz); |
664 | | - if (renderer != null) { |
665 | | - return renderer; |
666 | | - } |
667 | | - } |
668 | | - return null; |
669 | | - } |
670 | | - |
671 | 637 | public void setAdditivity(final boolean additivity) { |
672 | 638 | if (LogManager.isLog4jCorePresent()) { |
673 | 639 | CategoryUtil.setAdditivity(logger, additivity); |
|
0 commit comments