← Back to branch summary

~yolanda.robla/ubuntu/trusty/tomcat7/add_distribution_static_right_author

« back to all changes in this revision

Viewing changes to java/org/apache/catalina/connector/Request.java

  • Committer: Package Import Robot
  • Author(s): Gianfranco Costamagna, Gianfranco Costamagna
  • Date: 2013-07-16 17:34:58 UTC
  • mfrom: (1.1.14) (11.2.4 sid)
  • Revision ID: package-import@ubuntu.com-20130716173458-d8x1zcs7ds4ccne0
Tags: 7.0.42-1
http://bugs.debian.org/714348
[ Gianfranco Costamagna ]
* Team upload.
* New upstream release.
* Added libhamcrest-java >= 1.3 as build-dep,
  tweaked debian/rules.
* Bumped compat level to 9.
* Removed some version checks, newer releases already in oldstable.
* Refresh patches.
* debian/control: changed Vcs-Git and Vcs-Browser fields,
  now they are canonical.
* Fixed error message in Tomcat init script,
  patch by Thijs Kinkhorst (Closes: #714348)

Show diffs side-by-side

added added

removed removed

Lines of Context:
java/org/apache/catalina/connector/Request.java
101
101
 *
102
102
 * @author Remy Maucherat
103
103
 * @author Craig R. McClanahan
104
 
 * @version $Id: Request.java 1456935 2013-03-15 12:47:29Z markt $
 
104
 * @version $Id: Request.java 1486942 2013-05-28 14:48:58Z markt $
105
105
 */
106
106
 
107
107
public class Request
2733
2733
                    }
2734
2734
                }
2735
2735
                for (FileItem item : items) {
2736
 
                    ApplicationPart part = new ApplicationPart(item, mce);
 
2736
                    ApplicationPart part = new ApplicationPart(item, location);
2737
2737
                    parts.add(part);
2738
2738
                    if (part.getSubmittedFileName() == null) {
2739
2739
                        String name = part.getName();
2741
2741
                        try {
2742
2742
                            String encoding = parameters.getEncoding();
2743
2743
                            if (encoding == null) {
2744
 
                                encoding = Parameters.DEFAULT_ENCODING;
 
2744
                                if (enc == null) {
 
2745
                                    encoding = Parameters.DEFAULT_ENCODING;
 
2746
                                } else {
 
2747
                                    encoding = enc;
 
2748
                                }
2745
2749
                            }
2746
2750
                            value = part.getString(encoding);
2747
2751
                        } catch (UnsupportedEncodingException uee) {