From 3cd446b462a5ffee00c6fc129cd4a607aefa4008 Mon Sep 17 00:00:00 2001
From: Shikhar Bhushan <shikhar@schmizz.net>
Date: Fri, 6 Aug 2010 00:01:51 +0100
Subject: [PATCH] dumb

---
 .../java/net/schmizz/sshj/transport/Heartbeater.java   |  4 ++--
 src/main/java/net/schmizz/sshj/transport/Reader.java   | 10 ++++------
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/main/java/net/schmizz/sshj/transport/Heartbeater.java b/src/main/java/net/schmizz/sshj/transport/Heartbeater.java
index ca3b068e..84b697c5 100644
--- a/src/main/java/net/schmizz/sshj/transport/Heartbeater.java
+++ b/src/main/java/net/schmizz/sshj/transport/Heartbeater.java
@@ -77,7 +77,7 @@ final class Heartbeater
     public void run() {
         log.debug("Starting");
         try {
-            while (!Thread.currentThread().isInterrupted()) {
+            while (!isInterrupted()) {
                 final int hi = getPositiveInterval();
                 if (trans.isRunning()) {
                     log.info("Sending heartbeat since {} seconds elapsed", hi);
@@ -86,7 +86,7 @@ final class Heartbeater
                 Thread.sleep(hi * 1000);
             }
         } catch (Exception e) {
-            if (Thread.currentThread().isInterrupted()) {
+            if (isInterrupted()) {
                 // We are meant to shut up and draw to a close if interrupted
             } else
                 trans.die(e);
diff --git a/src/main/java/net/schmizz/sshj/transport/Reader.java b/src/main/java/net/schmizz/sshj/transport/Reader.java
index 9b91b72e..876b5621 100644
--- a/src/main/java/net/schmizz/sshj/transport/Reader.java
+++ b/src/main/java/net/schmizz/sshj/transport/Reader.java
@@ -41,22 +41,20 @@ import org.slf4j.LoggerFactory;
 
 import java.io.InputStream;
 
-final class Reader
+public final class Reader
         extends Thread {
 
     private final Logger log = LoggerFactory.getLogger(getClass());
 
     private final TransportImpl trans;
 
-    Reader(TransportImpl trans) {
+    public Reader(TransportImpl trans) {
         this.trans = trans;
         setName("reader");
     }
 
     @Override
     public void run() {
-        final Thread curThread = Thread.currentThread();
-
         try {
 
             final Decoder decoder = trans.getDecoder();
@@ -66,7 +64,7 @@ final class Reader
 
             int needed = 1;
 
-            while (!curThread.isInterrupted()) {
+            while (!isInterrupted()) {
                 int read = inp.read(recvbuf, 0, needed);
                 if (read == -1)
                     throw new TransportException("Broken transport; encountered EOF");
@@ -75,7 +73,7 @@ final class Reader
             }
 
         } catch (Exception e) {
-            if (curThread.isInterrupted()) {
+            if (isInterrupted()) {
                 // We are meant to shut up and draw to a close if interrupted
             } else
                 trans.die(e);