Merge branch '1.1.x'

pull/1593/head
Phillip Webb 10 years ago
commit 51b8b1e590

@ -96,6 +96,7 @@ public class LogbackLoggingSystem extends AbstractLoggingSystem {
+ "or the competing implementation (" + factory.getClass() + ")"); + "or the competing implementation (" + factory.getClass() + ")");
LoggerContext context = (LoggerContext) factory; LoggerContext context = (LoggerContext) factory;
context.stop(); context.stop();
context.reset();
try { try {
URL url = ResourceUtils.getURL(resolvedLocation); URL url = ResourceUtils.getURL(resolvedLocation);
new ContextInitializer(context).configureByResource(url); new ContextInitializer(context).configureByResource(url);

Loading…
Cancel
Save