From 963cd5438a2b2f779b9e81cc7edd6357b5231463 Mon Sep 17 00:00:00 2001 From: Travis Watkins Date: Mon, 2 Dec 2013 15:43:55 -0600 Subject: [PATCH] Catch all exceptions in jansi initialization. Fixes BUKKIT-4936 Both log4j and our own jline/jansi initialization attempt to catch errors caused by jansi's use of native libraries. However both of them use the Exception type which does not catch all errors. On Windows Server 2008 R2 Enterprise without installing extra software the required C++ libraries are not available which causes an error that does not extend Exception. To ensure we catch all errors I've changed both of these to catch Throwable instead which gets us a working console minus jansi functionality. --- src/main/java/net/minecraft/server/MinecraftServer.java | 2 +- .../org/apache/logging/log4j/core/appender/ConsoleAppender.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java index cdc41b41a5..c6710622dd 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -116,7 +116,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo try { this.reader = new ConsoleReader(System.in, System.out); this.reader.setExpandEvents(false); // Avoid parsing exceptions for uncommonly used event designators - } catch (Exception e) { + } catch (Throwable e) { try { // Try again with jline disabled for Windows users without C++ 2008 Redistributable System.setProperty("jline.terminal", "jline.UnsupportedTerminal"); diff --git a/src/main/java/org/apache/logging/log4j/core/appender/ConsoleAppender.java b/src/main/java/org/apache/logging/log4j/core/appender/ConsoleAppender.java index 5629e0b1d4..341eaa3342 100644 --- a/src/main/java/org/apache/logging/log4j/core/appender/ConsoleAppender.java +++ b/src/main/java/org/apache/logging/log4j/core/appender/ConsoleAppender.java @@ -130,7 +130,7 @@ public final class ConsoleAppender extends AbstractOutputStreamAppender { LOGGER.debug("Jansi is not installed, cannot find {}", JANSI_CLASS); } catch (final NoSuchMethodException nsme) { LOGGER.warn("{} is missing the proper constructor", JANSI_CLASS); - } catch (final Exception ex) { + } catch (final Throwable ex) { // CraftBukkit - Exception -> Throwable LOGGER.warn("Unable to instantiate {}", JANSI_CLASS); } return printStream;