Fix last modified time not being updated on linux (#203)

gnodet · web-flow · commit ee5fe41b032f · 2022-04-26T17:44:51.000+02:00
Fix test, clean things
diff --git a/src/main/java/org/codehaus/plexus/util/io/CachingOutputStream.java b/src/main/java/org/codehaus/plexus/util/io/CachingOutputStream.java
@@ -153,19 +153,17 @@ private void flushBuffer( ByteBuffer writeBuffer ) throws IOException
     @Override
     public void close() throws IOException
     {
-        flush();
-        long position = channel.position();
-        if ( position != channel.size() )
+        if ( channel.isOpen() )
         {
-            if ( !modified )
+            flush();
+            long position = channel.position();
+            if ( position != channel.size() )
             {
-                FileTime now = FileTime.from( Instant.now() );
-                Files.setLastModifiedTime( path, now );
                 modified = true;
+                channel.truncate( position );
             }
-            channel.truncate( position );
+            channel.close();
         }
-        channel.close();
     }
 
     public boolean isModified()
diff --git a/src/test/java/org/codehaus/plexus/util/io/CachingOutputStreamTest.java b/src/test/java/org/codehaus/plexus/util/io/CachingOutputStreamTest.java
@@ -17,7 +17,6 @@
  */
 
 import java.io.IOException;
-import java.io.OutputStream;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -39,7 +38,6 @@ public class CachingOutputStreamTest
 
     Path tempDir;
     Path checkLastModified;
-    FileTime lm;
 
     @Before
     public void setup() throws IOException
@@ -48,19 +46,18 @@ public void setup() throws IOException
         Files.createDirectories( dir );
         tempDir = Files.createTempDirectory( dir, "temp-" );
         checkLastModified = tempDir.resolve( ".check" );
-        Files.newOutputStream( checkLastModified ).close();
-        lm = Files.getLastModifiedTime( checkLastModified );
     }
 
     private void waitLastModified() throws IOException, InterruptedException
     {
+        Files.newOutputStream( checkLastModified ).close();
+        FileTime lm = Files.getLastModifiedTime( checkLastModified );
         while ( true )
         {
             Files.newOutputStream( checkLastModified ).close();
             FileTime nlm = Files.getLastModifiedTime( checkLastModified );
             if ( !Objects.equals( nlm, lm ) )
             {
-                lm = nlm;
                 break;
             }
             Thread.sleep( 10 );
diff --git a/src/test/java/org/codehaus/plexus/util/io/CachingWriterTest.java b/src/test/java/org/codehaus/plexus/util/io/CachingWriterTest.java
@@ -27,7 +27,6 @@
 import org.junit.Before;
 import org.junit.Test;
 
-import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotEquals;
@@ -38,7 +37,6 @@ public class CachingWriterTest
 
     Path tempDir;
     Path checkLastModified;
-    FileTime lm;
 
     @Before
     public void setup() throws IOException
@@ -47,19 +45,18 @@ public void setup() throws IOException
         Files.createDirectories( dir );
         tempDir = Files.createTempDirectory( dir, "temp-" );
         checkLastModified = tempDir.resolve( ".check" );
-        Files.newOutputStream( checkLastModified ).close();
-        lm = Files.getLastModifiedTime( checkLastModified );
     }
 
     private void waitLastModified() throws IOException, InterruptedException
     {
+        Files.newOutputStream( checkLastModified ).close();
+        FileTime lm = Files.getLastModifiedTime( checkLastModified );
         while ( true )
         {
             Files.newOutputStream( checkLastModified ).close();
             FileTime nlm = Files.getLastModifiedTime( checkLastModified );
             if ( !Objects.equals( nlm, lm ) )
             {
-                lm = nlm;
                 break;
             }
             Thread.sleep( 10 );

Original file line number	Diff line number	Diff line change
`@@ -153,19 +153,17 @@ private void flushBuffer( ByteBuffer writeBuffer ) throws IOException`
`153`	`153`	`@Override`
`154`	`154`	`public void close() throws IOException`
`155`	`155`	`{`
`156`		`- flush();`
`157`		`- long position = channel.position();`
`158`		`- if ( position != channel.size() )`
	`156`	`+ if ( channel.isOpen() )`
`159`	`157`	`{`
`160`		`- if ( !modified )`
	`158`	`+ flush();`
	`159`	`+ long position = channel.position();`
	`160`	`+ if ( position != channel.size() )`
`161`	`161`	`{`
`162`		`- FileTime now = FileTime.from( Instant.now() );`
`163`		`- Files.setLastModifiedTime( path, now );`
`164`	`162`	`modified = true;`
	`163`	`+ channel.truncate( position );`
`165`	`164`	`}`
`166`		`- channel.truncate( position );`
	`165`	`+ channel.close();`
`167`	`166`	`}`
`168`		`- channel.close();`
`169`	`167`	`}`
`170`	`168`
`171`	`169`	`public boolean isModified()`