svn commit: r964282 - in /camel/trunk/components: camel-http/src/main/java/org/apache/camel/component/http/helper/CamelFileDataSource.java camel-jetty/src/test/java/org/apache/camel/component/jetty/MultiPartFormTest.java

[ningjiang]

Author: ningjiang
Date: Thu Jul 15 02:19:30 2010
New Revision: 964282

URL: http://svn.apache.org/viewvc?rev=964282&view=rev
Log:
CAMEL-2949 return the actual file name of multipart file attachement

Modified:
    
camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/helper/CamelFileDataSource.java
    
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/MultiPartFormTest.java

Modified: 
camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/helper/CamelFileDataSource.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/helper/CamelFileDataSource.java?rev=964282&r1=964281&r2=964282&view=diff
==============================================================================
--- 
camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/helper/CamelFileDataSource.java
 (original)
+++ 
camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/helper/CamelFileDataSource.java
 Thu Jul 15 02:19:30 2010
@@ -41,5 +41,13 @@ public class CamelFileDataSource extends
     public void setFileTypeMap(FileTypeMap map) {
         typeMap = map;
     }
+    
+    public String getName() {
+        if (fileName != null) {
+            return fileName;
+        } else {
+            return super.getName();
+        }
+    }
 
 }

Modified: 
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/MultiPartFormTest.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/MultiPartFormTest.java?rev=964282&r1=964281&r2=964282&view=diff
==============================================================================
--- 
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/MultiPartFormTest.java
 (original)
+++ 
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/MultiPartFormTest.java
 Thu Jul 15 02:19:30 2010
@@ -78,6 +78,7 @@ public class MultiPartFormTest extends C
 
                         assertNotNull("Should get the DataHandle NOTICE.txt", 
data);
                         assertEquals("Get a wrong content type", "text/plain", 
data.getContentType());
+                        assertEquals("Got the wrong name", "NOTICE.txt", 
data.getName());
 
                         assertTrue("We should get the data from the 
DataHandle", data.getDataSource()
                             .getInputStream().available() > 0);