[fix] another try at restoring terminal settings

since the previous attempt (on runtime tear-down) does not always work

towards getting updates back: jruby/jruby#5387

actually also resolves: jruby/jruby#3181

Author: kares

src/main/java/org/jruby/ext/readline/Readline.java

@@ -53,6 +53,7 @@
 import org.jruby.anno.JRubyMethod;
 import org.jruby.anno.JRubyModule;
 import org.jruby.runtime.Block;
+import org.jruby.runtime.Helpers;
 import org.jruby.runtime.ThreadContext;
 import static org.jruby.runtime.Visibility.*;
 import org.jruby.runtime.builtin.IRubyObject;
@@ -215,16 +216,12 @@ private static IRubyObject readlineImpl(ThreadContext context, String prompt, fi
         holder.readline.setExpandEvents(false);
 
         String line;
-        while (true) {
-            try {
-                holder.readline.getTerminal().setEchoEnabled(false);
-                line = holder.readline.readLine(prompt);
-                break;
-            } catch (IOException ioe) {
-                throw runtime.newIOErrorFromException(ioe);
-            } finally {
-                holder.readline.getTerminal().setEchoEnabled(true);
-            }
+        try {
+            line = readlineLoop(holder.readline, prompt);
+        } catch (IOException ex) {
+            throw runtime.newIOErrorFromException(ex);
+        } catch (Exception ex) {
+            Helpers.throwException(ex); return null; // likely init/restore failure
         }
 
         if (line == null) return context.nil;
@@ -242,6 +239,17 @@ private static IRubyObject readlineImpl(ThreadContext context, String prompt, fi
         return RubyString.newString(runtime, bytes);
     }
 
+    private static String readlineLoop(final ConsoleReader reader, final String prompt) throws Exception {
+        while (true) {
+            try {
+                reader.getTerminal().init();
+                return reader.readLine(prompt);
+            } finally {
+                reader.getTerminal().restore();
+            }
+        }
+    }
+
     @JRubyMethod(name = "input=", module = true, visibility = PRIVATE)
     public static IRubyObject setInput(ThreadContext context, IRubyObject recv, IRubyObject input) {
         // FIXME: JRUBY-3604