IO-177 Should be handling InterruptedException when sleeping - not calling the exception handler

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/io/trunk@1005921 13f79535-47bb-0310-9956-ffa450edef68

Author: Niall Pemberton

src/main/java/org/apache/commons/io/input/Tailer.java

@@ -192,7 +192,10 @@ public void run() {
                 }
 
                 if (reader == null) {
-                    Thread.sleep(delay);
+                    try {
+                        Thread.sleep(delay);
+                    } catch (InterruptedException e) {
+                    }
                 } else {
                     // The current position in the file
                     position = end ? file.length() : 0;
@@ -250,8 +253,10 @@ public void run() {
                         position = readLines(reader);
                     }
                 }
-
-                Thread.sleep(delay);
+                try {
+                    Thread.sleep(delay);
+                } catch (InterruptedException e) {
+                }
             }
 
         } catch (Exception e) {

src/test/java/org/apache/commons/io/input/TailerTest.java

@@ -45,7 +45,9 @@ public void testTailer() throws Exception {
         File file = new File(getTestDirectory(), "tailer1-test.txt");
         createFile(file, 0);
         TestTailerListener listener = new TestTailerListener();
-        Tailer tailer = start(file, listener, delay, false);
+        final Tailer tailer = new Tailer(file, listener, delay, false);
+        final Thread thread = new Thread(tailer);
+        thread.start();
 
         // Write some lines to the file
         write(file, "Line one", "Line two");
@@ -86,6 +88,7 @@ public void testTailer() throws Exception {
 
         // Stop
         tailer.stop();
+        thread.interrupt();
         Thread.sleep(delay * 2);
         write(file, "Line five");
         assertEquals("4 line count", 0, listener.getLines().size());
@@ -95,14 +98,6 @@ public void testTailer() throws Exception {
         assertEquals("fileRotated should be be called", 1 , listener.rotated);
     }
 
-    /** Start a tailer */
-    private Tailer start(File file, TailerListener listener, long delay, boolean end) {
-        Tailer tailer = new Tailer(file, listener, delay, end);
-        Thread thread = new Thread(tailer);
-        thread.start();
-        return tailer;
-    }
-
     /** Append some lines to a file */
     private void write(File file, String... lines) throws Exception {
         FileWriter writer = null;