IO-279 Tailer erroneously considers file as new.

sebbASF · sebbASF · commit 7705470ba1ca · 2013-04-26T08:26:01.000Z
Fix to use file.lastModified() rather than System.currentTimeMillis() git-svn-id: https://svn.apache.org/repos/asf/commons/proper/io/trunk@1476097 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
@@ -47,6 +47,10 @@ The <action> type attribute can be add,update,fix,remove.
   <body>
     <!-- The release date is the date RC is cut -->
     <release version="2.5" date="2013-??-??" description="New features and bug fixes.">    
+      <action issue="IO-279" dev="sebb" type="fix">
+        Tailer erroneously considers file as new.
+        Fix to use file.lastModified() rather than System.currentTimeMillis()
+      </action>            
       <action issue="IO-356" dev="sebb" type="fix">
          CharSequenceInputStream#reset() behaves incorrectly in case when buffer size is not dividable by data size.
          Fix code so skip relates to the encoded bytes; reset now re-encodes the data up to the point of the mark
diff --git a/src/main/java/org/apache/commons/io/input/Tailer.java b/src/main/java/org/apache/commons/io/input/Tailer.java
@@ -363,7 +363,7 @@ public void run() {
                 } else {
                     // The current position in the file
                     position = end ? file.length() : 0;
-                    last = System.currentTimeMillis();
+                    last = file.lastModified();
                     reader.seek(position);
                 }
             }
@@ -400,7 +400,7 @@ public void run() {
                     if (length > position) {
                         // The file has more content than it did last time
                         position = readLines(reader);
-                        last = System.currentTimeMillis();
+                        last = file.lastModified();
                     } else if (newer) {
                         /*
                          * This can happen if the file is truncated or overwritten with the exact same length of
@@ -411,7 +411,7 @@ public void run() {
 
                         // Now we can read new lines
                         position = readLines(reader);
-                        last = System.currentTimeMillis();
+                        last = file.lastModified();
                     }
                 }
                 if (reOpen) {

Original file line number	Diff line number	Diff line change
`@@ -363,7 +363,7 @@ public void run() {`
`363`	`363`	`} else {`
`364`	`364`	`// The current position in the file`
`365`	`365`	`position = end ? file.length() : 0;`
`366`		`- last = System.currentTimeMillis();`
	`366`	`+ last = file.lastModified();`
`367`	`367`	`reader.seek(position);`
`368`	`368`	`}`
`369`	`369`	`}`
`@@ -400,7 +400,7 @@ public void run() {`
`400`	`400`	`if (length > position) {`
`401`	`401`	`// The file has more content than it did last time`
`402`	`402`	`position = readLines(reader);`
`403`		`- last = System.currentTimeMillis();`
	`403`	`+ last = file.lastModified();`
`404`	`404`	`} else if (newer) {`
`405`	`405`	`/*`
`406`	`406`	`* This can happen if the file is truncated or overwritten with the exact same length of`
`@@ -411,7 +411,7 @@ public void run() {`
`411`	`411`
`412`	`412`	`// Now we can read new lines`
`413`	`413`	`position = readLines(reader);`
`414`		`- last = System.currentTimeMillis();`
	`414`	`+ last = file.lastModified();`
`415`	`415`	`}`
`416`	`416`	`}`
`417`	`417`	`if (reOpen) {`