You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by ch...@apache.org on 2017/06/02 10:46:46 UTC
svn commit: r1797367 - in /jackrabbit/oak/branches/1.6: ./
oak-run/src/main/groovy/org/apache/jackrabbit/oak/console/GroovyConsole.groovy
Author: chetanm
Date: Fri Jun 2 10:46:46 2017
New Revision: 1797367
URL: http://svn.apache.org/viewvc?rev=1797367&view=rev
Log:
OAK-5961 - Handle scenario where jansi library cannot be loaded
Merged 1788056
Modified:
jackrabbit/oak/branches/1.6/ (props changed)
jackrabbit/oak/branches/1.6/oak-run/src/main/groovy/org/apache/jackrabbit/oak/console/GroovyConsole.groovy
Propchange: jackrabbit/oak/branches/1.6/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jun 2 10:46:46 2017
@@ -1,3 +1,3 @@
/jackrabbit/oak/branches/1.0:1665962
-/jackrabbit/oak/trunk:1781068,1781075,1781248,1781386,1781846,1781907,1782000,1782029,1782196,1782447,1782476,1782770,1782945,1782966,1782973,1782990,1783061,1783066,1783089,1783104-1783105,1783110,1783619,1783720,1783731,1783733,1783738,1783742,1783773,1783855,1783891,1784023,1784034,1784130,1784162,1784251,1784401,1784551,1784574,1784689,1785095,1785108,1785283,1785838,1785919,1785946,1787074,1787145,1787217,1787425,1788378,1788387-1788389,1788850,1789056,1790382,1792463,1792742,1792746,1793088,1793618,1793627,1793644,1795138,1795314,1795330,1795475,1795488,1795491,1795502,1795594,1795613,1795618,1796144,1796230,1796239,1796274,1796278,1796988
+/jackrabbit/oak/trunk:1781068,1781075,1781248,1781386,1781846,1781907,1782000,1782029,1782196,1782447,1782476,1782770,1782945,1782966,1782973,1782990,1783061,1783066,1783089,1783104-1783105,1783110,1783619,1783720,1783731,1783733,1783738,1783742,1783773,1783855,1783891,1784023,1784034,1784130,1784162,1784251,1784401,1784551,1784574,1784689,1785095,1785108,1785283,1785838,1785919,1785946,1787074,1787145,1787217,1787425,1788056,1788378,1788387-1788389,1788850,1789056,1790382,1792463,1792742,1792746,1793088,1793618,1793627,1793644,1795138,1795314,1795330,1795475,1795488,1795491,1795502,1795594,1795613,1795618,1796144,1796230,1796239,1796274,1796278,1796988
/jackrabbit/trunk:1345480
Modified: jackrabbit/oak/branches/1.6/oak-run/src/main/groovy/org/apache/jackrabbit/oak/console/GroovyConsole.groovy
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.6/oak-run/src/main/groovy/org/apache/jackrabbit/oak/console/GroovyConsole.groovy?rev=1797367&r1=1797366&r2=1797367&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.6/oak-run/src/main/groovy/org/apache/jackrabbit/oak/console/GroovyConsole.groovy (original)
+++ jackrabbit/oak/branches/1.6/oak-run/src/main/groovy/org/apache/jackrabbit/oak/console/GroovyConsole.groovy Fri Jun 2 10:46:46 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