svn commit: r1079697 - /wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/markup/html/form/upload/FileUpload.java

[ivaynberg]

Author: ivaynberg
Date: Wed Mar  9 08:30:21 2011
New Revision: 1079697

URL: http://svn.apache.org/viewvc?rev=1079697&view=rev
Log:

Issue: WICKET-3467

Modified:
    
wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/markup/html/form/upload/FileUpload.java

Modified: 
wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/markup/html/form/upload/FileUpload.java
URL: 
http://svn.apache.org/viewvc/wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/markup/html/form/upload/FileUpload.java?rev=1079697&r1=1079696&r2=1079697&view=diff
==============================================================================
--- 
wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/markup/html/form/upload/FileUpload.java
 (original)
+++ 
wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/markup/html/form/upload/FileUpload.java
 Wed Mar  9 08:30:21 2011
@@ -29,6 +29,7 @@ import org.apache.wicket.IClusterable;
 import org.apache.wicket.Session;
 import org.apache.wicket.WicketRuntimeException;
 import org.apache.wicket.util.file.Files;
+import org.apache.wicket.util.string.Strings;
 import org.apache.wicket.util.upload.FileItem;
 
 
@@ -167,7 +168,14 @@ public class FileUpload implements IClus
         */
        public String getClientFileName()
        {
-               return item.getName();
+               String name = item.getName();
+
+               // when uploading from localhost some browsers will specify the 
entire path, we strip it
+               // down to just the file name
+               name = Strings.lastPathComponent(name, '/');
+               name = Strings.lastPathComponent(name, '\\');
+
+               return name;
        }
 
        /**