Author: chetanm
Date: Wed Mar 22 06:31:13 2017
New Revision: 1788056
URL: http://svn.apache.org/viewvc?rev=1788056&view=rev
Log:
OAK-5961 - Handle scenario where jansi library cannot be loaded
Modified:
jackrabbit/oak/trunk/oak-run/src/main/groovy/org/apache/jackrabbit/oak/console/GroovyConsole.groovy
Modified:
jackrabbit/oak/trunk/oak-run/src/main/groovy/org/apache/jackrabbit/oak/console/GroovyConsole.groovy
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/src/main/groovy/org/apache/jackrabbit/oak/console/GroovyConsole.groovy?rev=1788056&r1=1788055&r2=1788056&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-run/src/main/groovy/org/apache/jackrabbit/oak/console/GroovyConsole.groovy
(original)
+++
jackrabbit/oak/trunk/oak-run/src/main/groovy/org/apache/jackrabbit/oak/console/GroovyConsole.groovy
Wed Mar 22 06:31:13 2017
@@ -30,6 +30,7 @@ import org.codehaus.groovy.runtime.Stack
import org.codehaus.groovy.tools.shell.*
import org.codehaus.groovy.tools.shell.Command as ShellCommand
import org.codehaus.groovy.tools.shell.commands.*
+import org.codehaus.groovy.tools.shell.util.Logger
import org.codehaus.groovy.tools.shell.util.Preferences
import org.fusesource.jansi.Ansi
import org.fusesource.jansi.AnsiConsole
@@ -41,11 +42,16 @@ import org.fusesource.jansi.AnsiRenderer
@CompileStatic
class GroovyConsole {
static {
- // Install the system adapters
- AnsiConsole.systemInstall()
+ try {
+ // Install the system adapters
+ AnsiConsole.systemInstall()
- // Register jline ansi detector
- Ansi.setDetector(new AnsiDetector())
+ // Register jline ansi detector
+ Ansi.setDetector(new AnsiDetector())
+ } catch (UnsatisfiedLinkError e){
+ Logger.create(GroovyConsole.class).warn("Error loading console
support. Some console features might not work properly. See " +
+ "https://issues.apache.org/jira/browse/OAK-5961 for
details", e)
+ }
}
private final ConsoleSession session
