Issue #422: Recover from link error when jna is unavailable

mabe02 · Jun 14, 2020 · 0f89334 · 0f89334
1 parent 60d8d41
commit 0f89334
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/main/java/com/googlecode/lanterna/terminal/DefaultTerminalFactory.java b/src/main/java/com/googlecode/lanterna/terminal/DefaultTerminalFactory.java
@@ -450,11 +450,11 @@ private Terminal createWindowsTerminal() throws IOException {
             Constructor<?> constructor = nativeImplementation.getConstructor(InputStream.class, OutputStream.class, Charset.class, UnixLikeTTYTerminal.CtrlCBehaviour.class);
             return (Terminal)constructor.newInstance(inputStream, outputStream, charset, UnixLikeTTYTerminal.CtrlCBehaviour.CTRL_C_KILLS_APPLICATION);
         }
-        catch(Exception ignore) {
+        catch(Exception | NoClassDefFoundError ignore) {
             try {
                 return createCygwinTerminal(outputStream, inputStream, charset);
             } catch(IOException e) {
-                throw new IOException("To start java on Windows, use javaw! (see https://github.com/mabe02/lanterna/issues/335 )", e);
+                throw new IOException("To use Lanterna on Windows, either add JNA (and jna-platform) to the classpath or use javaw! (see https://github.com/mabe02/lanterna/issues/335)", e);
             }
         }
     }