hc-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ol...@apache.org
Subject svn commit: r1682039 - in /httpcomponents/httpclient/trunk/httpmime/src: main/java/org/apache/http/entity/mime/content/FileBody.java test/java/org/apache/http/entity/mime/FormBodyPartTest.java
Date Wed, 27 May 2015 14:22:02 GMT
Author: olegk
Date: Wed May 27 14:22:01 2015
New Revision: 1682039

URL: http://svn.apache.org/r1682039
Log:
Fixed regresson in a deprecated method of FileBody
Contributed by Andrey Pohilko <apc4 at ya.ru>

Added:
    httpcomponents/httpclient/trunk/httpmime/src/test/java/org/apache/http/entity/mime/FormBodyPartTest.java
  (with props)
Modified:
    httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/http/entity/mime/content/FileBody.java

Modified: httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/http/entity/mime/content/FileBody.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/http/entity/mime/content/FileBody.java?rev=1682039&r1=1682038&r2=1682039&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/http/entity/mime/content/FileBody.java
(original)
+++ httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/http/entity/mime/content/FileBody.java
Wed May 27 14:22:01 2015
@@ -60,7 +60,7 @@ public class FileBody extends AbstractCo
         super(contentType);
         Args.notNull(file, "File");
         this.file = file;
-        this.filename = filename;
+        this.filename = filename == null ? file.getName() : filename;
     }
 
     /**

Added: httpcomponents/httpclient/trunk/httpmime/src/test/java/org/apache/http/entity/mime/FormBodyPartTest.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpmime/src/test/java/org/apache/http/entity/mime/FormBodyPartTest.java?rev=1682039&view=auto
==============================================================================
--- httpcomponents/httpclient/trunk/httpmime/src/test/java/org/apache/http/entity/mime/FormBodyPartTest.java
(added)
+++ httpcomponents/httpclient/trunk/httpmime/src/test/java/org/apache/http/entity/mime/FormBodyPartTest.java
Wed May 27 14:22:01 2015
@@ -0,0 +1,46 @@
+/*
+ * ====================================================================
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Apache Software Foundation.  For more
+ * information on the Apache Software Foundation, please see
+ * <http://www.apache.org/>.
+ *
+ */
+
+package org.apache.http.entity.mime;
+
+import org.apache.http.entity.ContentType;
+import org.apache.http.entity.mime.content.FileBody;
+import org.junit.Assert;
+import org.junit.Test;
+
+import java.io.File;
+
+public class FormBodyPartTest {
+
+    @Test
+    public void testConstructorCompat() throws Exception {
+        final File tmp= File.createTempFile("test", "test");
+        tmp.deleteOnExit();
+        final FileBody obj = new FileBody(tmp, ContentType.APPLICATION_OCTET_STREAM);
+        Assert.assertEquals(tmp.getName(), obj.getFilename());
+    }
+}
\ No newline at end of file

Propchange: httpcomponents/httpclient/trunk/httpmime/src/test/java/org/apache/http/entity/mime/FormBodyPartTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: httpcomponents/httpclient/trunk/httpmime/src/test/java/org/apache/http/entity/mime/FormBodyPartTest.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: httpcomponents/httpclient/trunk/httpmime/src/test/java/org/apache/http/entity/mime/FormBodyPartTest.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain



Mime
View raw message