TelnetInputStream now restores the current thread's interrupt flag when

catching InterruptedException.

Author: garydgregory

src/changes/changes.xml

@@ -68,6 +68,7 @@ The <action> type attribute can be add,update,fix,remove.
       <action type="fix" dev="ggregory" due-to="Gary Gregory">Fix malformed Javadoc comments.</action>
       <action type="fix" dev="ggregory" due-to="Gary Gregory">IMAPExportMbox now restores the current thread's interrupt flag when catching InterruptedException.</action>
       <action type="fix" dev="ggregory" due-to="Gary Gregory">IOUtil.readWrite() now restores the current thread's interrupt flag when catching InterruptedException.</action>
+      <action type="fix" dev="ggregory" due-to="Gary Gregory">TelnetInputStream now restores the current thread's interrupt flag when catching InterruptedException.</action>
       <!-- ADD -->
       <action type="add" dev="ggregory" due-to="Gary Gregory">Add DatagramSocketClient.getDefaultTimeoutDuration() and deprecate getDefaultTimeout().</action> 
       <!-- UPDATE -->

src/main/java/org/apache/commons/net/telnet/TelnetInputStream.java

@@ -149,6 +149,7 @@ private boolean processChar(final int ch) throws InterruptedException {
                 try {
                     queue.wait();
                 } catch (final InterruptedException e) {
+                    Thread.currentThread().interrupt();
                     throw e;
                 }
             }
@@ -197,6 +198,7 @@ public int read() throws IOException {
                             queue.wait();
                             readIsWaiting = false;
                         } catch (final InterruptedException e) {
+                            Thread.currentThread().interrupt();
                             throw new InterruptedIOException("Fatal thread interruption during read.");
                         }
                     } else {
@@ -218,7 +220,7 @@ public int read() throws IOException {
                                     try {
                                         queue.wait(100);
                                     } catch (final InterruptedException interrupted) {
-                                        // Ignored
+                                        Thread.currentThread().interrupt();
                                     }
                                 }
                                 return EOF;
@@ -229,6 +231,7 @@ public int read() throws IOException {
                                     processChar(ch);
                                 }
                             } catch (final InterruptedException e) {
+                                Thread.currentThread().interrupt();
                                 if (isClosed) {
                                     return EOF;
                                 }
@@ -508,6 +511,7 @@ public void run() {
                         try {
                             queue.wait(100);
                         } catch (final InterruptedException interrupted) {
+                            Thread.currentThread().interrupt();
                             if (isClosed) {
                                 break _outerLoop;
                             }
@@ -529,6 +533,7 @@ public void run() {
                 try {
                     notify = processChar(ch);
                 } catch (final InterruptedException e) {
+                    Thread.currentThread().interrupt();
                     if (isClosed) {
                         break _outerLoop;
                     }