changeset 400:e856ecf87b10

Backed out changeset aeb8c2e6d83a
author Carl Byington <carl@five-ten-sg.com>
date Mon, 20 Oct 2014 19:12:52 -0700
parents aeb8c2e6d83a
children 977815f990ec
files src/com/five_ten_sg/connectbot/service/TerminalMonitor.java
diffstat 1 files changed, 7 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- a/src/com/five_ten_sg/connectbot/service/TerminalMonitor.java	Wed Oct 15 18:03:27 2014 -0700
+++ b/src/com/five_ten_sg/connectbot/service/TerminalMonitor.java	Mon Oct 20 19:12:52 2014 -0700
@@ -95,17 +95,17 @@
                 }
             }
             catch (InterruptedException e) {
-                if (!is_closing) Log.e(TAG, "exception in MyWriter.run()", e);
+                if (!is_closing) Log.e(TAG, "exception in monitorWrite()", e);
             }
             catch (IOException e) {
-                Log.i(TAG, "exception in MyWriter.run(), monitor died or closed the socket", e);
+                Log.i(TAG, "exception in monitorWrite(), monitor died or closed the socket", e);
             }
 
             try {
                 monitor_out.close();
             }
-            catch (IOException e) {
-                Log.e(TAG, "exception in MyWriter.run() closing output stream", e);
+            catch (IOException ee) {
+                Log.e(TAG, "exception in monitorWrite() closing output stream", ee);
             }
             monitor_out = null;
         }
@@ -348,14 +348,9 @@
 
 
     public void monitorWrite(char cmd, char[] c) {
-        try {
-            c[0] = (char)(c.length - 1);    // number of chars following
-            c[1] = cmd;
-            pending_commands.put(c);
-        }
-        catch (InterruptedException e) {
-            Log.e(TAG, "exception in monitorWrite()", e);
-        }
+        c[0] = (char)(c.length - 1);    // number of chars following
+        c[1] = cmd;
+        pending_commands.put(c);
     };
 
     public void resetWatch() {