You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by mg...@apache.org on 2011/06/30 17:57:24 UTC

svn commit: r1141588 - in /wicket/trunk/wicket-util/src: main/java/org/apache/wicket/util/file/Files.java test/java/org/apache/wicket/util/file/FilesTest.java

Author: mgrigorov
Date: Thu Jun 30 15:57:24 2011
New Revision: 1141588

URL: http://svn.apache.org/viewvc?rev=1141588&view=rev
Log:
WICKET-3851  Remove usage of System.gc() in Wicket code

Do not try to remove non-existing file.


Modified:
    wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/file/Files.java
    wicket/trunk/wicket-util/src/test/java/org/apache/wicket/util/file/FilesTest.java

Modified: wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/file/Files.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/file/Files.java?rev=1141588&r1=1141587&r2=1141588&view=diff
==============================================================================
--- wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/file/Files.java (original)
+++ wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/file/Files.java Thu Jun 30 15:57:24 2011
@@ -111,10 +111,16 @@ public class Files
 	 * 
 	 * @param file
 	 *            File to delete
-	 * @return True if file was deleted
+	 * @return {@code true} if file was deleted, {@code false} if the file didn't exist or it cannot
+	 *         be removed for some reason
 	 */
 	public static boolean remove(final java.io.File file)
 	{
+		if (file.exists() == false)
+		{
+			return false;
+		}
+
 		int retries = 10;
 
 		boolean deleted = false;

Modified: wicket/trunk/wicket-util/src/test/java/org/apache/wicket/util/file/FilesTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-util/src/test/java/org/apache/wicket/util/file/FilesTest.java?rev=1141588&r1=1141587&r2=1141588&view=diff
==============================================================================
--- wicket/trunk/wicket-util/src/test/java/org/apache/wicket/util/file/FilesTest.java (original)
+++ wicket/trunk/wicket-util/src/test/java/org/apache/wicket/util/file/FilesTest.java Thu Jun 30 15:57:24 2011
@@ -39,5 +39,10 @@ public class FilesTest extends Assert
 		boolean removed = Files.remove(file);
 		assertFalse("The just removed file should not exist!", file.exists());
 		assertTrue("Files.remove(file) should remove the file", removed);
+
+		// try to remove non-existing file
+		removed = Files.remove(file);
+		assertFalse("The just removed file should not exist!", file.exists());
+		assertFalse("Files.remove(file) should not remove the file", removed);
 	}
 }