Modified: websites/production/commons/content/proper/commons-fileupload/apidocs/src-html/org/apache/commons/fileupload/FileUploadBase.SizeLimitExceededException.html ============================================================================== --- websites/production/commons/content/proper/commons-fileupload/apidocs/src-html/org/apache/commons/fileupload/FileUploadBase.SizeLimitExceededException.html (original) +++ websites/production/commons/content/proper/commons-fileupload/apidocs/src-html/org/apache/commons/fileupload/FileUploadBase.SizeLimitExceededException.html Wed Jan 16 11:35:52 2019 @@ -1,5 +1,5 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd";> -<html lang="de"> +<html lang="en"> <head> <title>Source code</title> <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style"> @@ -772,735 +772,747 @@ <span class="sourceLineNo">764</span> fieldName = pFieldName;<a name="line.764"></a> <span class="sourceLineNo">765</span> contentType = pContentType;<a name="line.765"></a> <span class="sourceLineNo">766</span> formField = pFormField;<a name="line.766"></a> -<span class="sourceLineNo">767</span> final ItemInputStream itemStream = multi.newInputStream();<a name="line.767"></a> -<span class="sourceLineNo">768</span> InputStream istream = itemStream;<a name="line.768"></a> -<span class="sourceLineNo">769</span> if (fileSizeMax != -1) {<a name="line.769"></a> -<span class="sourceLineNo">770</span> if (pContentLength != -1<a name="line.770"></a> -<span class="sourceLineNo">771</span> && pContentLength > fileSizeMax) {<a name="line.771"></a> -<span class="sourceLineNo">772</span> FileSizeLimitExceededException e =<a name="line.772"></a> -<span class="sourceLineNo">773</span> new FileSizeLimitExceededException(<a name="line.773"></a> -<span class="sourceLineNo">774</span> format("The field %s exceeds its maximum permitted size of %s bytes.",<a name="line.774"></a> -<span class="sourceLineNo">775</span> fieldName, Long.valueOf(fileSizeMax)),<a name="line.775"></a> -<span class="sourceLineNo">776</span> pContentLength, fileSizeMax);<a name="line.776"></a> -<span class="sourceLineNo">777</span> e.setFileName(pName);<a name="line.777"></a> -<span class="sourceLineNo">778</span> e.setFieldName(pFieldName);<a name="line.778"></a> -<span class="sourceLineNo">779</span> throw new FileUploadIOException(e);<a name="line.779"></a> -<span class="sourceLineNo">780</span> }<a name="line.780"></a> -<span class="sourceLineNo">781</span> istream = new LimitedInputStream(istream, fileSizeMax) {<a name="line.781"></a> -<span class="sourceLineNo">782</span> @Override<a name="line.782"></a> -<span class="sourceLineNo">783</span> protected void raiseError(long pSizeMax, long pCount)<a name="line.783"></a> -<span class="sourceLineNo">784</span> throws IOException {<a name="line.784"></a> -<span class="sourceLineNo">785</span> itemStream.close(true);<a name="line.785"></a> -<span class="sourceLineNo">786</span> FileSizeLimitExceededException e =<a name="line.786"></a> -<span class="sourceLineNo">787</span> new FileSizeLimitExceededException(<a name="line.787"></a> -<span class="sourceLineNo">788</span> format("The field %s exceeds its maximum permitted size of %s bytes.",<a name="line.788"></a> -<span class="sourceLineNo">789</span> fieldName, Long.valueOf(pSizeMax)),<a name="line.789"></a> -<span class="sourceLineNo">790</span> pCount, pSizeMax);<a name="line.790"></a> -<span class="sourceLineNo">791</span> e.setFieldName(fieldName);<a name="line.791"></a> -<span class="sourceLineNo">792</span> e.setFileName(name);<a name="line.792"></a> -<span class="sourceLineNo">793</span> throw new FileUploadIOException(e);<a name="line.793"></a> -<span class="sourceLineNo">794</span> }<a name="line.794"></a> -<span class="sourceLineNo">795</span> };<a name="line.795"></a> -<span class="sourceLineNo">796</span> }<a name="line.796"></a> -<span class="sourceLineNo">797</span> stream = istream;<a name="line.797"></a> -<span class="sourceLineNo">798</span> }<a name="line.798"></a> -<span class="sourceLineNo">799</span><a name="line.799"></a> -<span class="sourceLineNo">800</span> /**<a name="line.800"></a> -<span class="sourceLineNo">801</span> * Returns the items content type, or null.<a name="line.801"></a> -<span class="sourceLineNo">802</span> *<a name="line.802"></a> -<span class="sourceLineNo">803</span> * @return Content type, if known, or null.<a name="line.803"></a> -<span class="sourceLineNo">804</span> */<a name="line.804"></a> -<span class="sourceLineNo">805</span> public String getContentType() {<a name="line.805"></a> -<span class="sourceLineNo">806</span> return contentType;<a name="line.806"></a> -<span class="sourceLineNo">807</span> }<a name="line.807"></a> -<span class="sourceLineNo">808</span><a name="line.808"></a> -<span class="sourceLineNo">809</span> /**<a name="line.809"></a> -<span class="sourceLineNo">810</span> * Returns the items field name.<a name="line.810"></a> -<span class="sourceLineNo">811</span> *<a name="line.811"></a> -<span class="sourceLineNo">812</span> * @return Field name.<a name="line.812"></a> -<span class="sourceLineNo">813</span> */<a name="line.813"></a> -<span class="sourceLineNo">814</span> public String getFieldName() {<a name="line.814"></a> -<span class="sourceLineNo">815</span> return fieldName;<a name="line.815"></a> -<span class="sourceLineNo">816</span> }<a name="line.816"></a> -<span class="sourceLineNo">817</span><a name="line.817"></a> -<span class="sourceLineNo">818</span> /**<a name="line.818"></a> -<span class="sourceLineNo">819</span> * Returns the items file name.<a name="line.819"></a> -<span class="sourceLineNo">820</span> *<a name="line.820"></a> -<span class="sourceLineNo">821</span> * @return File name, if known, or null.<a name="line.821"></a> -<span class="sourceLineNo">822</span> * @throws InvalidFileNameException The file name contains a NUL character,<a name="line.822"></a> -<span class="sourceLineNo">823</span> * which might be an indicator of a security attack. If you intend to<a name="line.823"></a> -<span class="sourceLineNo">824</span> * use the file name anyways, catch the exception and use<a name="line.824"></a> -<span class="sourceLineNo">825</span> * InvalidFileNameException#getName().<a name="line.825"></a> -<span class="sourceLineNo">826</span> */<a name="line.826"></a> -<span class="sourceLineNo">827</span> public String getName() {<a name="line.827"></a> -<span class="sourceLineNo">828</span> return Streams.checkFileName(name);<a name="line.828"></a> -<span class="sourceLineNo">829</span> }<a name="line.829"></a> -<span class="sourceLineNo">830</span><a name="line.830"></a> -<span class="sourceLineNo">831</span> /**<a name="line.831"></a> -<span class="sourceLineNo">832</span> * Returns, whether this is a form field.<a name="line.832"></a> -<span class="sourceLineNo">833</span> *<a name="line.833"></a> -<span class="sourceLineNo">834</span> * @return True, if the item is a form field,<a name="line.834"></a> -<span class="sourceLineNo">835</span> * otherwise false.<a name="line.835"></a> -<span class="sourceLineNo">836</span> */<a name="line.836"></a> -<span class="sourceLineNo">837</span> public boolean isFormField() {<a name="line.837"></a> -<span class="sourceLineNo">838</span> return formField;<a name="line.838"></a> -<span class="sourceLineNo">839</span> }<a name="line.839"></a> -<span class="sourceLineNo">840</span><a name="line.840"></a> -<span class="sourceLineNo">841</span> /**<a name="line.841"></a> -<span class="sourceLineNo">842</span> * Returns an input stream, which may be used to<a name="line.842"></a> -<span class="sourceLineNo">843</span> * read the items contents.<a name="line.843"></a> -<span class="sourceLineNo">844</span> *<a name="line.844"></a> -<span class="sourceLineNo">845</span> * @return Opened input stream.<a name="line.845"></a> -<span class="sourceLineNo">846</span> * @throws IOException An I/O error occurred.<a name="line.846"></a> -<span class="sourceLineNo">847</span> */<a name="line.847"></a> -<span class="sourceLineNo">848</span> public InputStream openStream() throws IOException {<a name="line.848"></a> -<span class="sourceLineNo">849</span> if (opened) {<a name="line.849"></a> -<span class="sourceLineNo">850</span> throw new IllegalStateException(<a name="line.850"></a> -<span class="sourceLineNo">851</span> "The stream was already opened.");<a name="line.851"></a> -<span class="sourceLineNo">852</span> }<a name="line.852"></a> -<span class="sourceLineNo">853</span> if (((Closeable) stream).isClosed()) {<a name="line.853"></a> -<span class="sourceLineNo">854</span> throw new FileItemStream.ItemSkippedException();<a name="line.854"></a> -<span class="sourceLineNo">855</span> }<a name="line.855"></a> -<span class="sourceLineNo">856</span> return stream;<a name="line.856"></a> -<span class="sourceLineNo">857</span> }<a name="line.857"></a> -<span class="sourceLineNo">858</span><a name="line.858"></a> -<span class="sourceLineNo">859</span> /**<a name="line.859"></a> -<span class="sourceLineNo">860</span> * Closes the file item.<a name="line.860"></a> -<span class="sourceLineNo">861</span> *<a name="line.861"></a> -<span class="sourceLineNo">862</span> * @throws IOException An I/O error occurred.<a name="line.862"></a> -<span class="sourceLineNo">863</span> */<a name="line.863"></a> -<span class="sourceLineNo">864</span> void close() throws IOException {<a name="line.864"></a> -<span class="sourceLineNo">865</span> stream.close();<a name="line.865"></a> -<span class="sourceLineNo">866</span> }<a name="line.866"></a> -<span class="sourceLineNo">867</span><a name="line.867"></a> -<span class="sourceLineNo">868</span> /**<a name="line.868"></a> -<span class="sourceLineNo">869</span> * Returns the file item headers.<a name="line.869"></a> -<span class="sourceLineNo">870</span> *<a name="line.870"></a> -<span class="sourceLineNo">871</span> * @return The items header object<a name="line.871"></a> -<span class="sourceLineNo">872</span> */<a name="line.872"></a> -<span class="sourceLineNo">873</span> public FileItemHeaders getHeaders() {<a name="line.873"></a> -<span class="sourceLineNo">874</span> return headers;<a name="line.874"></a> -<span class="sourceLineNo">875</span> }<a name="line.875"></a> -<span class="sourceLineNo">876</span><a name="line.876"></a> -<span class="sourceLineNo">877</span> /**<a name="line.877"></a> -<span class="sourceLineNo">878</span> * Sets the file item headers.<a name="line.878"></a> -<span class="sourceLineNo">879</span> *<a name="line.879"></a> -<span class="sourceLineNo">880</span> * @param pHeaders The items header object<a name="line.880"></a> -<span class="sourceLineNo">881</span> */<a name="line.881"></a> -<span class="sourceLineNo">882</span> public void setHeaders(FileItemHeaders pHeaders) {<a name="line.882"></a> -<span class="sourceLineNo">883</span> headers = pHeaders;<a name="line.883"></a> +<span class="sourceLineNo">767</span> if (fileSizeMax != -1) { // Check if limit is already exceeded<a name="line.767"></a> +<span class="sourceLineNo">768</span> if (pContentLength != -1<a name="line.768"></a> +<span class="sourceLineNo">769</span> && pContentLength > fileSizeMax) {<a name="line.769"></a> +<span class="sourceLineNo">770</span> FileSizeLimitExceededException e =<a name="line.770"></a> +<span class="sourceLineNo">771</span> new FileSizeLimitExceededException(<a name="line.771"></a> +<span class="sourceLineNo">772</span> format("The field %s exceeds its maximum permitted size of %s bytes.",<a name="line.772"></a> +<span class="sourceLineNo">773</span> fieldName, Long.valueOf(fileSizeMax)),<a name="line.773"></a> +<span class="sourceLineNo">774</span> pContentLength, fileSizeMax);<a name="line.774"></a> +<span class="sourceLineNo">775</span> e.setFileName(pName);<a name="line.775"></a> +<span class="sourceLineNo">776</span> e.setFieldName(pFieldName);<a name="line.776"></a> +<span class="sourceLineNo">777</span> throw new FileUploadIOException(e);<a name="line.777"></a> +<span class="sourceLineNo">778</span> }<a name="line.778"></a> +<span class="sourceLineNo">779</span> }<a name="line.779"></a> +<span class="sourceLineNo">780</span> // OK to construct stream now<a name="line.780"></a> +<span class="sourceLineNo">781</span> final ItemInputStream itemStream = multi.newInputStream();<a name="line.781"></a> +<span class="sourceLineNo">782</span> InputStream istream = itemStream;<a name="line.782"></a> +<span class="sourceLineNo">783</span> if (fileSizeMax != -1) {<a name="line.783"></a> +<span class="sourceLineNo">784</span> istream = new LimitedInputStream(istream, fileSizeMax) {<a name="line.784"></a> +<span class="sourceLineNo">785</span> @Override<a name="line.785"></a> +<span class="sourceLineNo">786</span> protected void raiseError(long pSizeMax, long pCount)<a name="line.786"></a> +<span class="sourceLineNo">787</span> throws IOException {<a name="line.787"></a> +<span class="sourceLineNo">788</span> itemStream.close(true);<a name="line.788"></a> +<span class="sourceLineNo">789</span> FileSizeLimitExceededException e =<a name="line.789"></a> +<span class="sourceLineNo">790</span> new FileSizeLimitExceededException(<a name="line.790"></a> +<span class="sourceLineNo">791</span> format("The field %s exceeds its maximum permitted size of %s bytes.",<a name="line.791"></a> +<span class="sourceLineNo">792</span> fieldName, Long.valueOf(pSizeMax)),<a name="line.792"></a> +<span class="sourceLineNo">793</span> pCount, pSizeMax);<a name="line.793"></a> +<span class="sourceLineNo">794</span> e.setFieldName(fieldName);<a name="line.794"></a> +<span class="sourceLineNo">795</span> e.setFileName(name);<a name="line.795"></a> +<span class="sourceLineNo">796</span> throw new FileUploadIOException(e);<a name="line.796"></a> +<span class="sourceLineNo">797</span> }<a name="line.797"></a> +<span class="sourceLineNo">798</span> };<a name="line.798"></a> +<span class="sourceLineNo">799</span> }<a name="line.799"></a> +<span class="sourceLineNo">800</span> stream = istream;<a name="line.800"></a> +<span class="sourceLineNo">801</span> }<a name="line.801"></a> +<span class="sourceLineNo">802</span><a name="line.802"></a> +<span class="sourceLineNo">803</span> /**<a name="line.803"></a> +<span class="sourceLineNo">804</span> * Returns the items content type, or null.<a name="line.804"></a> +<span class="sourceLineNo">805</span> *<a name="line.805"></a> +<span class="sourceLineNo">806</span> * @return Content type, if known, or null.<a name="line.806"></a> +<span class="sourceLineNo">807</span> */<a name="line.807"></a> +<span class="sourceLineNo">808</span> @Override<a name="line.808"></a> +<span class="sourceLineNo">809</span> public String getContentType() {<a name="line.809"></a> +<span class="sourceLineNo">810</span> return contentType;<a name="line.810"></a> +<span class="sourceLineNo">811</span> }<a name="line.811"></a> +<span class="sourceLineNo">812</span><a name="line.812"></a> +<span class="sourceLineNo">813</span> /**<a name="line.813"></a> +<span class="sourceLineNo">814</span> * Returns the items field name.<a name="line.814"></a> +<span class="sourceLineNo">815</span> *<a name="line.815"></a> +<span class="sourceLineNo">816</span> * @return Field name.<a name="line.816"></a> +<span class="sourceLineNo">817</span> */<a name="line.817"></a> +<span class="sourceLineNo">818</span> @Override<a name="line.818"></a> +<span class="sourceLineNo">819</span> public String getFieldName() {<a name="line.819"></a> +<span class="sourceLineNo">820</span> return fieldName;<a name="line.820"></a> +<span class="sourceLineNo">821</span> }<a name="line.821"></a> +<span class="sourceLineNo">822</span><a name="line.822"></a> +<span class="sourceLineNo">823</span> /**<a name="line.823"></a> +<span class="sourceLineNo">824</span> * Returns the items file name.<a name="line.824"></a> +<span class="sourceLineNo">825</span> *<a name="line.825"></a> +<span class="sourceLineNo">826</span> * @return File name, if known, or null.<a name="line.826"></a> +<span class="sourceLineNo">827</span> * @throws InvalidFileNameException The file name contains a NUL character,<a name="line.827"></a> +<span class="sourceLineNo">828</span> * which might be an indicator of a security attack. If you intend to<a name="line.828"></a> +<span class="sourceLineNo">829</span> * use the file name anyways, catch the exception and use<a name="line.829"></a> +<span class="sourceLineNo">830</span> * InvalidFileNameException#getName().<a name="line.830"></a> +<span class="sourceLineNo">831</span> */<a name="line.831"></a> +<span class="sourceLineNo">832</span> @Override<a name="line.832"></a> +<span class="sourceLineNo">833</span> public String getName() {<a name="line.833"></a> +<span class="sourceLineNo">834</span> return Streams.checkFileName(name);<a name="line.834"></a> +<span class="sourceLineNo">835</span> }<a name="line.835"></a> +<span class="sourceLineNo">836</span><a name="line.836"></a> +<span class="sourceLineNo">837</span> /**<a name="line.837"></a> +<span class="sourceLineNo">838</span> * Returns, whether this is a form field.<a name="line.838"></a> +<span class="sourceLineNo">839</span> *<a name="line.839"></a> +<span class="sourceLineNo">840</span> * @return True, if the item is a form field,<a name="line.840"></a> +<span class="sourceLineNo">841</span> * otherwise false.<a name="line.841"></a> +<span class="sourceLineNo">842</span> */<a name="line.842"></a> +<span class="sourceLineNo">843</span> @Override<a name="line.843"></a> +<span class="sourceLineNo">844</span> public boolean isFormField() {<a name="line.844"></a> +<span class="sourceLineNo">845</span> return formField;<a name="line.845"></a> +<span class="sourceLineNo">846</span> }<a name="line.846"></a> +<span class="sourceLineNo">847</span><a name="line.847"></a> +<span class="sourceLineNo">848</span> /**<a name="line.848"></a> +<span class="sourceLineNo">849</span> * Returns an input stream, which may be used to<a name="line.849"></a> +<span class="sourceLineNo">850</span> * read the items contents.<a name="line.850"></a> +<span class="sourceLineNo">851</span> *<a name="line.851"></a> +<span class="sourceLineNo">852</span> * @return Opened input stream.<a name="line.852"></a> +<span class="sourceLineNo">853</span> * @throws IOException An I/O error occurred.<a name="line.853"></a> +<span class="sourceLineNo">854</span> */<a name="line.854"></a> +<span class="sourceLineNo">855</span> @Override<a name="line.855"></a> +<span class="sourceLineNo">856</span> public InputStream openStream() throws IOException {<a name="line.856"></a> +<span class="sourceLineNo">857</span> if (opened) {<a name="line.857"></a> +<span class="sourceLineNo">858</span> throw new IllegalStateException(<a name="line.858"></a> +<span class="sourceLineNo">859</span> "The stream was already opened.");<a name="line.859"></a> +<span class="sourceLineNo">860</span> }<a name="line.860"></a> +<span class="sourceLineNo">861</span> if (((Closeable) stream).isClosed()) {<a name="line.861"></a> +<span class="sourceLineNo">862</span> throw new FileItemStream.ItemSkippedException();<a name="line.862"></a> +<span class="sourceLineNo">863</span> }<a name="line.863"></a> +<span class="sourceLineNo">864</span> return stream;<a name="line.864"></a> +<span class="sourceLineNo">865</span> }<a name="line.865"></a> +<span class="sourceLineNo">866</span><a name="line.866"></a> +<span class="sourceLineNo">867</span> /**<a name="line.867"></a> +<span class="sourceLineNo">868</span> * Closes the file item.<a name="line.868"></a> +<span class="sourceLineNo">869</span> *<a name="line.869"></a> +<span class="sourceLineNo">870</span> * @throws IOException An I/O error occurred.<a name="line.870"></a> +<span class="sourceLineNo">871</span> */<a name="line.871"></a> +<span class="sourceLineNo">872</span> void close() throws IOException {<a name="line.872"></a> +<span class="sourceLineNo">873</span> stream.close();<a name="line.873"></a> +<span class="sourceLineNo">874</span> }<a name="line.874"></a> +<span class="sourceLineNo">875</span><a name="line.875"></a> +<span class="sourceLineNo">876</span> /**<a name="line.876"></a> +<span class="sourceLineNo">877</span> * Returns the file item headers.<a name="line.877"></a> +<span class="sourceLineNo">878</span> *<a name="line.878"></a> +<span class="sourceLineNo">879</span> * @return The items header object<a name="line.879"></a> +<span class="sourceLineNo">880</span> */<a name="line.880"></a> +<span class="sourceLineNo">881</span> @Override<a name="line.881"></a> +<span class="sourceLineNo">882</span> public FileItemHeaders getHeaders() {<a name="line.882"></a> +<span class="sourceLineNo">883</span> return headers;<a name="line.883"></a> <span class="sourceLineNo">884</span> }<a name="line.884"></a> <span class="sourceLineNo">885</span><a name="line.885"></a> -<span class="sourceLineNo">886</span> }<a name="line.886"></a> -<span class="sourceLineNo">887</span><a name="line.887"></a> -<span class="sourceLineNo">888</span> /**<a name="line.888"></a> -<span class="sourceLineNo">889</span> * The multi part stream to process.<a name="line.889"></a> -<span class="sourceLineNo">890</span> */<a name="line.890"></a> -<span class="sourceLineNo">891</span> private final MultipartStream multi;<a name="line.891"></a> -<span class="sourceLineNo">892</span><a name="line.892"></a> -<span class="sourceLineNo">893</span> /**<a name="line.893"></a> -<span class="sourceLineNo">894</span> * The notifier, which used for triggering the<a name="line.894"></a> -<span class="sourceLineNo">895</span> * {@link ProgressListener}.<a name="line.895"></a> -<span class="sourceLineNo">896</span> */<a name="line.896"></a> -<span class="sourceLineNo">897</span> private final MultipartStream.ProgressNotifier notifier;<a name="line.897"></a> -<span class="sourceLineNo">898</span><a name="line.898"></a> -<span class="sourceLineNo">899</span> /**<a name="line.899"></a> -<span class="sourceLineNo">900</span> * The boundary, which separates the various parts.<a name="line.900"></a> -<span class="sourceLineNo">901</span> */<a name="line.901"></a> -<span class="sourceLineNo">902</span> private final byte[] boundary;<a name="line.902"></a> -<span class="sourceLineNo">903</span><a name="line.903"></a> -<span class="sourceLineNo">904</span> /**<a name="line.904"></a> -<span class="sourceLineNo">905</span> * The item, which we currently process.<a name="line.905"></a> +<span class="sourceLineNo">886</span> /**<a name="line.886"></a> +<span class="sourceLineNo">887</span> * Sets the file item headers.<a name="line.887"></a> +<span class="sourceLineNo">888</span> *<a name="line.888"></a> +<span class="sourceLineNo">889</span> * @param pHeaders The items header object<a name="line.889"></a> +<span class="sourceLineNo">890</span> */<a name="line.890"></a> +<span class="sourceLineNo">891</span> @Override<a name="line.891"></a> +<span class="sourceLineNo">892</span> public void setHeaders(FileItemHeaders pHeaders) {<a name="line.892"></a> +<span class="sourceLineNo">893</span> headers = pHeaders;<a name="line.893"></a> +<span class="sourceLineNo">894</span> }<a name="line.894"></a> +<span class="sourceLineNo">895</span><a name="line.895"></a> +<span class="sourceLineNo">896</span> }<a name="line.896"></a> +<span class="sourceLineNo">897</span><a name="line.897"></a> +<span class="sourceLineNo">898</span> /**<a name="line.898"></a> +<span class="sourceLineNo">899</span> * The multi part stream to process.<a name="line.899"></a> +<span class="sourceLineNo">900</span> */<a name="line.900"></a> +<span class="sourceLineNo">901</span> private final MultipartStream multi;<a name="line.901"></a> +<span class="sourceLineNo">902</span><a name="line.902"></a> +<span class="sourceLineNo">903</span> /**<a name="line.903"></a> +<span class="sourceLineNo">904</span> * The notifier, which used for triggering the<a name="line.904"></a> +<span class="sourceLineNo">905</span> * {@link ProgressListener}.<a name="line.905"></a> <span class="sourceLineNo">906</span> */<a name="line.906"></a> -<span class="sourceLineNo">907</span> private FileItemStreamImpl currentItem;<a name="line.907"></a> +<span class="sourceLineNo">907</span> private final MultipartStream.ProgressNotifier notifier;<a name="line.907"></a> <span class="sourceLineNo">908</span><a name="line.908"></a> <span class="sourceLineNo">909</span> /**<a name="line.909"></a> -<span class="sourceLineNo">910</span> * The current items field name.<a name="line.910"></a> +<span class="sourceLineNo">910</span> * The boundary, which separates the various parts.<a name="line.910"></a> <span class="sourceLineNo">911</span> */<a name="line.911"></a> -<span class="sourceLineNo">912</span> private String currentFieldName;<a name="line.912"></a> +<span class="sourceLineNo">912</span> private final byte[] boundary;<a name="line.912"></a> <span class="sourceLineNo">913</span><a name="line.913"></a> <span class="sourceLineNo">914</span> /**<a name="line.914"></a> -<span class="sourceLineNo">915</span> * Whether we are currently skipping the preamble.<a name="line.915"></a> +<span class="sourceLineNo">915</span> * The item, which we currently process.<a name="line.915"></a> <span class="sourceLineNo">916</span> */<a name="line.916"></a> -<span class="sourceLineNo">917</span> private boolean skipPreamble;<a name="line.917"></a> +<span class="sourceLineNo">917</span> private FileItemStreamImpl currentItem;<a name="line.917"></a> <span class="sourceLineNo">918</span><a name="line.918"></a> <span class="sourceLineNo">919</span> /**<a name="line.919"></a> -<span class="sourceLineNo">920</span> * Whether the current item may still be read.<a name="line.920"></a> +<span class="sourceLineNo">920</span> * The current items field name.<a name="line.920"></a> <span class="sourceLineNo">921</span> */<a name="line.921"></a> -<span class="sourceLineNo">922</span> private boolean itemValid;<a name="line.922"></a> +<span class="sourceLineNo">922</span> private String currentFieldName;<a name="line.922"></a> <span class="sourceLineNo">923</span><a name="line.923"></a> <span class="sourceLineNo">924</span> /**<a name="line.924"></a> -<span class="sourceLineNo">925</span> * Whether we have seen the end of the file.<a name="line.925"></a> +<span class="sourceLineNo">925</span> * Whether we are currently skipping the preamble.<a name="line.925"></a> <span class="sourceLineNo">926</span> */<a name="line.926"></a> -<span class="sourceLineNo">927</span> private boolean eof;<a name="line.927"></a> +<span class="sourceLineNo">927</span> private boolean skipPreamble;<a name="line.927"></a> <span class="sourceLineNo">928</span><a name="line.928"></a> <span class="sourceLineNo">929</span> /**<a name="line.929"></a> -<span class="sourceLineNo">930</span> * Creates a new instance.<a name="line.930"></a> -<span class="sourceLineNo">931</span> *<a name="line.931"></a> -<span class="sourceLineNo">932</span> * @param ctx The request context.<a name="line.932"></a> -<span class="sourceLineNo">933</span> * @throws FileUploadException An error occurred while<a name="line.933"></a> -<span class="sourceLineNo">934</span> * parsing the request.<a name="line.934"></a> -<span class="sourceLineNo">935</span> * @throws IOException An I/O error occurred.<a name="line.935"></a> +<span class="sourceLineNo">930</span> * Whether the current item may still be read.<a name="line.930"></a> +<span class="sourceLineNo">931</span> */<a name="line.931"></a> +<span class="sourceLineNo">932</span> private boolean itemValid;<a name="line.932"></a> +<span class="sourceLineNo">933</span><a name="line.933"></a> +<span class="sourceLineNo">934</span> /**<a name="line.934"></a> +<span class="sourceLineNo">935</span> * Whether we have seen the end of the file.<a name="line.935"></a> <span class="sourceLineNo">936</span> */<a name="line.936"></a> -<span class="sourceLineNo">937</span> FileItemIteratorImpl(RequestContext ctx)<a name="line.937"></a> -<span class="sourceLineNo">938</span> throws FileUploadException, IOException {<a name="line.938"></a> -<span class="sourceLineNo">939</span> if (ctx == null) {<a name="line.939"></a> -<span class="sourceLineNo">940</span> throw new NullPointerException("ctx parameter");<a name="line.940"></a> -<span class="sourceLineNo">941</span> }<a name="line.941"></a> -<span class="sourceLineNo">942</span><a name="line.942"></a> -<span class="sourceLineNo">943</span> String contentType = ctx.getContentType();<a name="line.943"></a> -<span class="sourceLineNo">944</span> if ((null == contentType)<a name="line.944"></a> -<span class="sourceLineNo">945</span> || (!contentType.toLowerCase(Locale.ENGLISH).startsWith(MULTIPART))) {<a name="line.945"></a> -<span class="sourceLineNo">946</span> throw new InvalidContentTypeException(<a name="line.946"></a> -<span class="sourceLineNo">947</span> format("the request doesn't contain a %s or %s stream, content type header is %s",<a name="line.947"></a> -<span class="sourceLineNo">948</span> MULTIPART_FORM_DATA, MULTIPART_MIXED, contentType));<a name="line.948"></a> -<span class="sourceLineNo">949</span> }<a name="line.949"></a> -<span class="sourceLineNo">950</span><a name="line.950"></a> -<span class="sourceLineNo">951</span><a name="line.951"></a> -<span class="sourceLineNo">952</span> @SuppressWarnings("deprecation") // still has to be backward compatible<a name="line.952"></a> -<span class="sourceLineNo">953</span> final int contentLengthInt = ctx.getContentLength();<a name="line.953"></a> -<span class="sourceLineNo">954</span><a name="line.954"></a> -<span class="sourceLineNo">955</span> final long requestSize = UploadContext.class.isAssignableFrom(ctx.getClass())<a name="line.955"></a> -<span class="sourceLineNo">956</span> // Inline conditional is OK here CHECKSTYLE:OFF<a name="line.956"></a> -<span class="sourceLineNo">957</span> ? ((UploadContext) ctx).contentLength()<a name="line.957"></a> -<span class="sourceLineNo">958</span> : contentLengthInt;<a name="line.958"></a> -<span class="sourceLineNo">959</span> // CHECKSTYLE:ON<a name="line.959"></a> +<span class="sourceLineNo">937</span> private boolean eof;<a name="line.937"></a> +<span class="sourceLineNo">938</span><a name="line.938"></a> +<span class="sourceLineNo">939</span> /**<a name="line.939"></a> +<span class="sourceLineNo">940</span> * Creates a new instance.<a name="line.940"></a> +<span class="sourceLineNo">941</span> *<a name="line.941"></a> +<span class="sourceLineNo">942</span> * @param ctx The request context.<a name="line.942"></a> +<span class="sourceLineNo">943</span> * @throws FileUploadException An error occurred while<a name="line.943"></a> +<span class="sourceLineNo">944</span> * parsing the request.<a name="line.944"></a> +<span class="sourceLineNo">945</span> * @throws IOException An I/O error occurred.<a name="line.945"></a> +<span class="sourceLineNo">946</span> */<a name="line.946"></a> +<span class="sourceLineNo">947</span> FileItemIteratorImpl(RequestContext ctx)<a name="line.947"></a> +<span class="sourceLineNo">948</span> throws FileUploadException, IOException {<a name="line.948"></a> +<span class="sourceLineNo">949</span> if (ctx == null) {<a name="line.949"></a> +<span class="sourceLineNo">950</span> throw new NullPointerException("ctx parameter");<a name="line.950"></a> +<span class="sourceLineNo">951</span> }<a name="line.951"></a> +<span class="sourceLineNo">952</span><a name="line.952"></a> +<span class="sourceLineNo">953</span> String contentType = ctx.getContentType();<a name="line.953"></a> +<span class="sourceLineNo">954</span> if ((null == contentType)<a name="line.954"></a> +<span class="sourceLineNo">955</span> || (!contentType.toLowerCase(Locale.ENGLISH).startsWith(MULTIPART))) {<a name="line.955"></a> +<span class="sourceLineNo">956</span> throw new InvalidContentTypeException(<a name="line.956"></a> +<span class="sourceLineNo">957</span> format("the request doesn't contain a %s or %s stream, content type header is %s",<a name="line.957"></a> +<span class="sourceLineNo">958</span> MULTIPART_FORM_DATA, MULTIPART_MIXED, contentType));<a name="line.958"></a> +<span class="sourceLineNo">959</span> }<a name="line.959"></a> <span class="sourceLineNo">960</span><a name="line.960"></a> -<span class="sourceLineNo">961</span> InputStream input; // N.B. this is eventually closed in MultipartStream processing<a name="line.961"></a> -<span class="sourceLineNo">962</span> if (sizeMax >= 0) {<a name="line.962"></a> -<span class="sourceLineNo">963</span> if (requestSize != -1 && requestSize > sizeMax) {<a name="line.963"></a> -<span class="sourceLineNo">964</span> throw new SizeLimitExceededException(<a name="line.964"></a> -<span class="sourceLineNo">965</span> format("the request was rejected because its size (%s) exceeds the configured maximum (%s)",<a name="line.965"></a> -<span class="sourceLineNo">966</span> Long.valueOf(requestSize), Long.valueOf(sizeMax)),<a name="line.966"></a> -<span class="sourceLineNo">967</span> requestSize, sizeMax);<a name="line.967"></a> -<span class="sourceLineNo">968</span> }<a name="line.968"></a> -<span class="sourceLineNo">969</span> // N.B. this is eventually closed in MultipartStream processing<a name="line.969"></a> -<span class="sourceLineNo">970</span> input = new LimitedInputStream(ctx.getInputStream(), sizeMax) {<a name="line.970"></a> -<span class="sourceLineNo">971</span> @Override<a name="line.971"></a> -<span class="sourceLineNo">972</span> protected void raiseError(long pSizeMax, long pCount)<a name="line.972"></a> -<span class="sourceLineNo">973</span> throws IOException {<a name="line.973"></a> -<span class="sourceLineNo">974</span> FileUploadException ex = new SizeLimitExceededException(<a name="line.974"></a> +<span class="sourceLineNo">961</span><a name="line.961"></a> +<span class="sourceLineNo">962</span> @SuppressWarnings("deprecation") // still has to be backward compatible<a name="line.962"></a> +<span class="sourceLineNo">963</span> final int contentLengthInt = ctx.getContentLength();<a name="line.963"></a> +<span class="sourceLineNo">964</span><a name="line.964"></a> +<span class="sourceLineNo">965</span> final long requestSize = UploadContext.class.isAssignableFrom(ctx.getClass())<a name="line.965"></a> +<span class="sourceLineNo">966</span> // Inline conditional is OK here CHECKSTYLE:OFF<a name="line.966"></a> +<span class="sourceLineNo">967</span> ? ((UploadContext) ctx).contentLength()<a name="line.967"></a> +<span class="sourceLineNo">968</span> : contentLengthInt;<a name="line.968"></a> +<span class="sourceLineNo">969</span> // CHECKSTYLE:ON<a name="line.969"></a> +<span class="sourceLineNo">970</span><a name="line.970"></a> +<span class="sourceLineNo">971</span> InputStream input; // N.B. this is eventually closed in MultipartStream processing<a name="line.971"></a> +<span class="sourceLineNo">972</span> if (sizeMax >= 0) {<a name="line.972"></a> +<span class="sourceLineNo">973</span> if (requestSize != -1 && requestSize > sizeMax) {<a name="line.973"></a> +<span class="sourceLineNo">974</span> throw new SizeLimitExceededException(<a name="line.974"></a> <span class="sourceLineNo">975</span> format("the request was rejected because its size (%s) exceeds the configured maximum (%s)",<a name="line.975"></a> -<span class="sourceLineNo">976</span> Long.valueOf(pCount), Long.valueOf(pSizeMax)),<a name="line.976"></a> -<span class="sourceLineNo">977</span> pCount, pSizeMax);<a name="line.977"></a> -<span class="sourceLineNo">978</span> throw new FileUploadIOException(ex);<a name="line.978"></a> -<span class="sourceLineNo">979</span> }<a name="line.979"></a> -<span class="sourceLineNo">980</span> };<a name="line.980"></a> -<span class="sourceLineNo">981</span> } else {<a name="line.981"></a> -<span class="sourceLineNo">982</span> input = ctx.getInputStream();<a name="line.982"></a> -<span class="sourceLineNo">983</span> }<a name="line.983"></a> -<span class="sourceLineNo">984</span><a name="line.984"></a> -<span class="sourceLineNo">985</span> String charEncoding = headerEncoding;<a name="line.985"></a> -<span class="sourceLineNo">986</span> if (charEncoding == null) {<a name="line.986"></a> -<span class="sourceLineNo">987</span> charEncoding = ctx.getCharacterEncoding();<a name="line.987"></a> -<span class="sourceLineNo">988</span> }<a name="line.988"></a> -<span class="sourceLineNo">989</span><a name="line.989"></a> -<span class="sourceLineNo">990</span> boundary = getBoundary(contentType);<a name="line.990"></a> -<span class="sourceLineNo">991</span> if (boundary == null) {<a name="line.991"></a> -<span class="sourceLineNo">992</span> IOUtils.closeQuietly(input); // avoid possible resource leak<a name="line.992"></a> -<span class="sourceLineNo">993</span> throw new FileUploadException("the request was rejected because no multipart boundary was found");<a name="line.993"></a> -<span class="sourceLineNo">994</span> }<a name="line.994"></a> -<span class="sourceLineNo">995</span><a name="line.995"></a> -<span class="sourceLineNo">996</span> notifier = new MultipartStream.ProgressNotifier(listener, requestSize);<a name="line.996"></a> -<span class="sourceLineNo">997</span> try {<a name="line.997"></a> -<span class="sourceLineNo">998</span> multi = new MultipartStream(input, boundary, notifier);<a name="line.998"></a> -<span class="sourceLineNo">999</span> } catch (IllegalArgumentException iae) {<a name="line.999"></a> -<span class="sourceLineNo">1000</span> IOUtils.closeQuietly(input); // avoid possible resource leak<a name="line.1000"></a> -<span class="sourceLineNo">1001</span> throw new InvalidContentTypeException(<a name="line.1001"></a> -<span class="sourceLineNo">1002</span> format("The boundary specified in the %s header is too long", CONTENT_TYPE), iae);<a name="line.1002"></a> -<span class="sourceLineNo">1003</span> }<a name="line.1003"></a> -<span class="sourceLineNo">1004</span> multi.setHeaderEncoding(charEncoding);<a name="line.1004"></a> +<span class="sourceLineNo">976</span> Long.valueOf(requestSize), Long.valueOf(sizeMax)),<a name="line.976"></a> +<span class="sourceLineNo">977</span> requestSize, sizeMax);<a name="line.977"></a> +<span class="sourceLineNo">978</span> }<a name="line.978"></a> +<span class="sourceLineNo">979</span> // N.B. this is eventually closed in MultipartStream processing<a name="line.979"></a> +<span class="sourceLineNo">980</span> input = new LimitedInputStream(ctx.getInputStream(), sizeMax) {<a name="line.980"></a> +<span class="sourceLineNo">981</span> @Override<a name="line.981"></a> +<span class="sourceLineNo">982</span> protected void raiseError(long pSizeMax, long pCount)<a name="line.982"></a> +<span class="sourceLineNo">983</span> throws IOException {<a name="line.983"></a> +<span class="sourceLineNo">984</span> FileUploadException ex = new SizeLimitExceededException(<a name="line.984"></a> +<span class="sourceLineNo">985</span> format("the request was rejected because its size (%s) exceeds the configured maximum (%s)",<a name="line.985"></a> +<span class="sourceLineNo">986</span> Long.valueOf(pCount), Long.valueOf(pSizeMax)),<a name="line.986"></a> +<span class="sourceLineNo">987</span> pCount, pSizeMax);<a name="line.987"></a> +<span class="sourceLineNo">988</span> throw new FileUploadIOException(ex);<a name="line.988"></a> +<span class="sourceLineNo">989</span> }<a name="line.989"></a> +<span class="sourceLineNo">990</span> };<a name="line.990"></a> +<span class="sourceLineNo">991</span> } else {<a name="line.991"></a> +<span class="sourceLineNo">992</span> input = ctx.getInputStream();<a name="line.992"></a> +<span class="sourceLineNo">993</span> }<a name="line.993"></a> +<span class="sourceLineNo">994</span><a name="line.994"></a> +<span class="sourceLineNo">995</span> String charEncoding = headerEncoding;<a name="line.995"></a> +<span class="sourceLineNo">996</span> if (charEncoding == null) {<a name="line.996"></a> +<span class="sourceLineNo">997</span> charEncoding = ctx.getCharacterEncoding();<a name="line.997"></a> +<span class="sourceLineNo">998</span> }<a name="line.998"></a> +<span class="sourceLineNo">999</span><a name="line.999"></a> +<span class="sourceLineNo">1000</span> boundary = getBoundary(contentType);<a name="line.1000"></a> +<span class="sourceLineNo">1001</span> if (boundary == null) {<a name="line.1001"></a> +<span class="sourceLineNo">1002</span> IOUtils.closeQuietly(input); // avoid possible resource leak<a name="line.1002"></a> +<span class="sourceLineNo">1003</span> throw new FileUploadException("the request was rejected because no multipart boundary was found");<a name="line.1003"></a> +<span class="sourceLineNo">1004</span> }<a name="line.1004"></a> <span class="sourceLineNo">1005</span><a name="line.1005"></a> -<span class="sourceLineNo">1006</span> skipPreamble = true;<a name="line.1006"></a> -<span class="sourceLineNo">1007</span> findNextItem();<a name="line.1007"></a> -<span class="sourceLineNo">1008</span> }<a name="line.1008"></a> -<span class="sourceLineNo">1009</span><a name="line.1009"></a> -<span class="sourceLineNo">1010</span> /**<a name="line.1010"></a> -<span class="sourceLineNo">1011</span> * Called for finding the next item, if any.<a name="line.1011"></a> -<span class="sourceLineNo">1012</span> *<a name="line.1012"></a> -<span class="sourceLineNo">1013</span> * @return True, if an next item was found, otherwise false.<a name="line.1013"></a> -<span class="sourceLineNo">1014</span> * @throws IOException An I/O error occurred.<a name="line.1014"></a> -<span class="sourceLineNo">1015</span> */<a name="line.1015"></a> -<span class="sourceLineNo">1016</span> private boolean findNextItem() throws IOException {<a name="line.1016"></a> -<span class="sourceLineNo">1017</span> if (eof) {<a name="line.1017"></a> -<span class="sourceLineNo">1018</span> return false;<a name="line.1018"></a> -<span class="sourceLineNo">1019</span> }<a name="line.1019"></a> -<span class="sourceLineNo">1020</span> if (currentItem != null) {<a name="line.1020"></a> -<span class="sourceLineNo">1021</span> currentItem.close();<a name="line.1021"></a> -<span class="sourceLineNo">1022</span> currentItem = null;<a name="line.1022"></a> -<span class="sourceLineNo">1023</span> }<a name="line.1023"></a> -<span class="sourceLineNo">1024</span> for (;;) {<a name="line.1024"></a> -<span class="sourceLineNo">1025</span> boolean nextPart;<a name="line.1025"></a> -<span class="sourceLineNo">1026</span> if (skipPreamble) {<a name="line.1026"></a> -<span class="sourceLineNo">1027</span> nextPart = multi.skipPreamble();<a name="line.1027"></a> -<span class="sourceLineNo">1028</span> } else {<a name="line.1028"></a> -<span class="sourceLineNo">1029</span> nextPart = multi.readBoundary();<a name="line.1029"></a> -<span class="sourceLineNo">1030</span> }<a name="line.1030"></a> -<span class="sourceLineNo">1031</span> if (!nextPart) {<a name="line.1031"></a> -<span class="sourceLineNo">1032</span> if (currentFieldName == null) {<a name="line.1032"></a> -<span class="sourceLineNo">1033</span> // Outer multipart terminated -> No more data<a name="line.1033"></a> -<span class="sourceLineNo">1034</span> eof = true;<a name="line.1034"></a> -<span class="sourceLineNo">1035</span> return false;<a name="line.1035"></a> -<span class="sourceLineNo">1036</span> }<a name="line.1036"></a> -<span class="sourceLineNo">1037</span> // Inner multipart terminated -> Return to parsing the outer<a name="line.1037"></a> -<span class="sourceLineNo">1038</span> multi.setBoundary(boundary);<a name="line.1038"></a> -<span class="sourceLineNo">1039</span> currentFieldName = null;<a name="line.1039"></a> -<span class="sourceLineNo">1040</span> continue;<a name="line.1040"></a> -<span class="sourceLineNo">1041</span> }<a name="line.1041"></a> -<span class="sourceLineNo">1042</span> FileItemHeaders headers = getParsedHeaders(multi.readHeaders());<a name="line.1042"></a> -<span class="sourceLineNo">1043</span> if (currentFieldName == null) {<a name="line.1043"></a> -<span class="sourceLineNo">1044</span> // We're parsing the outer multipart<a name="line.1044"></a> -<span class="sourceLineNo">1045</span> String fieldName = getFieldName(headers);<a name="line.1045"></a> -<span class="sourceLineNo">1046</span> if (fieldName != null) {<a name="line.1046"></a> -<span class="sourceLineNo">1047</span> String subContentType = headers.getHeader(CONTENT_TYPE);<a name="line.1047"></a> -<span class="sourceLineNo">1048</span> if (subContentType != null<a name="line.1048"></a> -<span class="sourceLineNo">1049</span> && subContentType.toLowerCase(Locale.ENGLISH)<a name="line.1049"></a> -<span class="sourceLineNo">1050</span> .startsWith(MULTIPART_MIXED)) {<a name="line.1050"></a> -<span class="sourceLineNo">1051</span> currentFieldName = fieldName;<a name="line.1051"></a> -<span class="sourceLineNo">1052</span> // Multiple files associated with this field name<a name="line.1052"></a> -<span class="sourceLineNo">1053</span> byte[] subBoundary = getBoundary(subContentType);<a name="line.1053"></a> -<span class="sourceLineNo">1054</span> multi.setBoundary(subBoundary);<a name="line.1054"></a> -<span class="sourceLineNo">1055</span> skipPreamble = true;<a name="line.1055"></a> -<span class="sourceLineNo">1056</span> continue;<a name="line.1056"></a> -<span class="sourceLineNo">1057</span> }<a name="line.1057"></a> -<span class="sourceLineNo">1058</span> String fileName = getFileName(headers);<a name="line.1058"></a> -<span class="sourceLineNo">1059</span> currentItem = new FileItemStreamImpl(fileName,<a name="line.1059"></a> -<span class="sourceLineNo">1060</span> fieldName, headers.getHeader(CONTENT_TYPE),<a name="line.1060"></a> -<span class="sourceLineNo">1061</span> fileName == null, getContentLength(headers));<a name="line.1061"></a> -<span class="sourceLineNo">1062</span> currentItem.setHeaders(headers);<a name="line.1062"></a> -<span class="sourceLineNo">1063</span> notifier.noteItem();<a name="line.1063"></a> -<span class="sourceLineNo">1064</span> itemValid = true;<a name="line.1064"></a> -<span class="sourceLineNo">1065</span> return true;<a name="line.1065"></a> -<span class="sourceLineNo">1066</span> }<a name="line.1066"></a> -<span class="sourceLineNo">1067</span> } else {<a name="line.1067"></a> -<span class="sourceLineNo">1068</span> String fileName = getFileName(headers);<a name="line.1068"></a> -<span class="sourceLineNo">1069</span> if (fileName != null) {<a name="line.1069"></a> -<span class="sourceLineNo">1070</span> currentItem = new FileItemStreamImpl(fileName,<a name="line.1070"></a> -<span class="sourceLineNo">1071</span> currentFieldName,<a name="line.1071"></a> -<span class="sourceLineNo">1072</span> headers.getHeader(CONTENT_TYPE),<a name="line.1072"></a> -<span class="sourceLineNo">1073</span> false, getContentLength(headers));<a name="line.1073"></a> -<span class="sourceLineNo">1074</span> currentItem.setHeaders(headers);<a name="line.1074"></a> -<span class="sourceLineNo">1075</span> notifier.noteItem();<a name="line.1075"></a> -<span class="sourceLineNo">1076</span> itemValid = true;<a name="line.1076"></a> -<span class="sourceLineNo">1077</span> return true;<a name="line.1077"></a> -<span class="sourceLineNo">1078</span> }<a name="line.1078"></a> -<span class="sourceLineNo">1079</span> }<a name="line.1079"></a> -<span class="sourceLineNo">1080</span> multi.discardBodyData();<a name="line.1080"></a> -<span class="sourceLineNo">1081</span> }<a name="line.1081"></a> -<span class="sourceLineNo">1082</span> }<a name="line.1082"></a> -<span class="sourceLineNo">1083</span><a name="line.1083"></a> -<span class="sourceLineNo">1084</span> private long getContentLength(FileItemHeaders pHeaders) {<a name="line.1084"></a> -<span class="sourceLineNo">1085</span> try {<a name="line.1085"></a> -<span class="sourceLineNo">1086</span> return Long.parseLong(pHeaders.getHeader(CONTENT_LENGTH));<a name="line.1086"></a> -<span class="sourceLineNo">1087</span> } catch (Exception e) {<a name="line.1087"></a> -<span class="sourceLineNo">1088</span> return -1;<a name="line.1088"></a> -<span class="sourceLineNo">1089</span> }<a name="line.1089"></a> -<span class="sourceLineNo">1090</span> }<a name="line.1090"></a> -<span class="sourceLineNo">1091</span><a name="line.1091"></a> -<span class="sourceLineNo">1092</span> /**<a name="line.1092"></a> -<span class="sourceLineNo">1093</span> * Returns, whether another instance of {@link FileItemStream}<a name="line.1093"></a> -<span class="sourceLineNo">1094</span> * is available.<a name="line.1094"></a> -<span class="sourceLineNo">1095</span> *<a name="line.1095"></a> -<span class="sourceLineNo">1096</span> * @throws FileUploadException Parsing or processing the<a name="line.1096"></a> -<span class="sourceLineNo">1097</span> * file item failed.<a name="line.1097"></a> -<span class="sourceLineNo">1098</span> * @throws IOException Reading the file item failed.<a name="line.1098"></a> -<span class="sourceLineNo">1099</span> * @return True, if one or more additional file items<a name="line.1099"></a> -<span class="sourceLineNo">1100</span> * are available, otherwise false.<a name="line.1100"></a> -<span class="sourceLineNo">1101</span> */<a name="line.1101"></a> -<span class="sourceLineNo">1102</span> public boolean hasNext() throws FileUploadException, IOException {<a name="line.1102"></a> -<span class="sourceLineNo">1103</span> if (eof) {<a name="line.1103"></a> -<span class="sourceLineNo">1104</span> return false;<a name="line.1104"></a> -<span class="sourceLineNo">1105</span> }<a name="line.1105"></a> -<span class="sourceLineNo">1106</span> if (itemValid) {<a name="line.1106"></a> -<span class="sourceLineNo">1107</span> return true;<a name="line.1107"></a> -<span class="sourceLineNo">1108</span> }<a name="line.1108"></a> -<span class="sourceLineNo">1109</span> try {<a name="line.1109"></a> -<span class="sourceLineNo">1110</span> return findNextItem();<a name="line.1110"></a> -<span class="sourceLineNo">1111</span> } catch (FileUploadIOException e) {<a name="line.1111"></a> -<span class="sourceLineNo">1112</span> // unwrap encapsulated SizeException<a name="line.1112"></a> -<span class="sourceLineNo">1113</span> throw (FileUploadException) e.getCause();<a name="line.1113"></a> -<span class="sourceLineNo">1114</span> }<a name="line.1114"></a> -<span class="sourceLineNo">1115</span> }<a name="line.1115"></a> -<span class="sourceLineNo">1116</span><a name="line.1116"></a> -<span class="sourceLineNo">1117</span> /**<a name="line.1117"></a> -<span class="sourceLineNo">1118</span> * Returns the next available {@link FileItemStream}.<a name="line.1118"></a> -<span class="sourceLineNo">1119</span> *<a name="line.1119"></a> -<span class="sourceLineNo">1120</span> * @throws java.util.NoSuchElementException No more items are<a name="line.1120"></a> -<span class="sourceLineNo">1121</span> * available. Use {@link #hasNext()} to prevent this exception.<a name="line.1121"></a> -<span class="sourceLineNo">1122</span> * @throws FileUploadException Parsing or processing the<a name="line.1122"></a> -<span class="sourceLineNo">1123</span> * file item failed.<a name="line.1123"></a> -<span class="sourceLineNo">1124</span> * @throws IOException Reading the file item failed.<a name="line.1124"></a> -<span class="sourceLineNo">1125</span> * @return FileItemStream instance, which provides<a name="line.1125"></a> -<span class="sourceLineNo">1126</span> * access to the next file item.<a name="line.1126"></a> -<span class="sourceLineNo">1127</span> */<a name="line.1127"></a> -<span class="sourceLineNo">1128</span> public FileItemStream next() throws FileUploadException, IOException {<a name="line.1128"></a> -<span class="sourceLineNo">1129</span> if (eof || (!itemValid && !hasNext())) {<a name="line.1129"></a> -<span class="sourceLineNo">1130</span> throw new NoSuchElementException();<a name="line.1130"></a> -<span class="sourceLineNo">1131</span> }<a name="line.1131"></a> -<span class="sourceLineNo">1132</span> itemValid = false;<a name="line.1132"></a> -<span class="sourceLineNo">1133</span> return currentItem;<a name="line.1133"></a> -<span class="sourceLineNo">1134</span> }<a name="line.1134"></a> -<span class="sourceLineNo">1135</span><a name="line.1135"></a> -<span class="sourceLineNo">1136</span> }<a name="line.1136"></a> -<span class="sourceLineNo">1137</span><a name="line.1137"></a> -<span class="sourceLineNo">1138</span> /**<a name="line.1138"></a> -<span class="sourceLineNo">1139</span> * This exception is thrown for hiding an inner<a name="line.1139"></a> -<span class="sourceLineNo">1140</span> * {@link FileUploadException} in an {@link IOException}.<a name="line.1140"></a> -<span class="sourceLineNo">1141</span> */<a name="line.1141"></a> -<span class="sourceLineNo">1142</span> public static class FileUploadIOException extends IOException {<a name="line.1142"></a> -<span class="sourceLineNo">1143</span><a name="line.1143"></a> -<span class="sourceLineNo">1144</span> /**<a name="line.1144"></a> -<span class="sourceLineNo">1145</span> * The exceptions UID, for serializing an instance.<a name="line.1145"></a> -<span class="sourceLineNo">1146</span> */<a name="line.1146"></a> -<span class="sourceLineNo">1147</span> private static final long serialVersionUID = -7047616958165584154L;<a name="line.1147"></a> -<span class="sourceLineNo">1148</span><a name="line.1148"></a> -<span class="sourceLineNo">1149</span> /**<a name="line.1149"></a> -<span class="sourceLineNo">1150</span> * The exceptions cause; we overwrite the parent<a name="line.1150"></a> -<span class="sourceLineNo">1151</span> * classes field, which is available since Java<a name="line.1151"></a> -<span class="sourceLineNo">1152</span> * 1.4 only.<a name="line.1152"></a> -<span class="sourceLineNo">1153</span> */<a name="line.1153"></a> -<span class="sourceLineNo">1154</span> private final FileUploadException cause;<a name="line.1154"></a> +<span class="sourceLineNo">1006</span> notifier = new MultipartStream.ProgressNotifier(listener, requestSize);<a name="line.1006"></a> +<span class="sourceLineNo">1007</span> try {<a name="line.1007"></a> +<span class="sourceLineNo">1008</span> multi = new MultipartStream(input, boundary, notifier);<a name="line.1008"></a> +<span class="sourceLineNo">1009</span> } catch (IllegalArgumentException iae) {<a name="line.1009"></a> +<span class="sourceLineNo">1010</span> IOUtils.closeQuietly(input); // avoid possible resource leak<a name="line.1010"></a> +<span class="sourceLineNo">1011</span> throw new InvalidContentTypeException(<a name="line.1011"></a> +<span class="sourceLineNo">1012</span> format("The boundary specified in the %s header is too long", CONTENT_TYPE), iae);<a name="line.1012"></a> +<span class="sourceLineNo">1013</span> }<a name="line.1013"></a> +<span class="sourceLineNo">1014</span> multi.setHeaderEncoding(charEncoding);<a name="line.1014"></a> +<span class="sourceLineNo">1015</span><a name="line.1015"></a> +<span class="sourceLineNo">1016</span> skipPreamble = true;<a name="line.1016"></a> +<span class="sourceLineNo">1017</span> findNextItem();<a name="line.1017"></a> +<span class="sourceLineNo">1018</span> }<a name="line.1018"></a> +<span class="sourceLineNo">1019</span><a name="line.1019"></a> +<span class="sourceLineNo">1020</span> /**<a name="line.1020"></a> +<span class="sourceLineNo">1021</span> * Called for finding the next item, if any.<a name="line.1021"></a> +<span class="sourceLineNo">1022</span> *<a name="line.1022"></a> +<span class="sourceLineNo">1023</span> * @return True, if an next item was found, otherwise false.<a name="line.1023"></a> +<span class="sourceLineNo">1024</span> * @throws IOException An I/O error occurred.<a name="line.1024"></a> +<span class="sourceLineNo">1025</span> */<a name="line.1025"></a> +<span class="sourceLineNo">1026</span> private boolean findNextItem() throws IOException {<a name="line.1026"></a> +<span class="sourceLineNo">1027</span> if (eof) {<a name="line.1027"></a> +<span class="sourceLineNo">1028</span> return false;<a name="line.1028"></a> +<span class="sourceLineNo">1029</span> }<a name="line.1029"></a> +<span class="sourceLineNo">1030</span> if (currentItem != null) {<a name="line.1030"></a> +<span class="sourceLineNo">1031</span> currentItem.close();<a name="line.1031"></a> +<span class="sourceLineNo">1032</span> currentItem = null;<a name="line.1032"></a> +<span class="sourceLineNo">1033</span> }<a name="line.1033"></a> +<span class="sourceLineNo">1034</span> for (;;) {<a name="line.1034"></a> +<span class="sourceLineNo">1035</span> boolean nextPart;<a name="line.1035"></a> +<span class="sourceLineNo">1036</span> if (skipPreamble) {<a name="line.1036"></a> +<span class="sourceLineNo">1037</span> nextPart = multi.skipPreamble();<a name="line.1037"></a> +<span class="sourceLineNo">1038</span> } else {<a name="line.1038"></a> +<span class="sourceLineNo">1039</span> nextPart = multi.readBoundary();<a name="line.1039"></a> +<span class="sourceLineNo">1040</span> }<a name="line.1040"></a> +<span class="sourceLineNo">1041</span> if (!nextPart) {<a name="line.1041"></a> +<span class="sourceLineNo">1042</span> if (currentFieldName == null) {<a name="line.1042"></a> +<span class="sourceLineNo">1043</span> // Outer multipart terminated -> No more data<a name="line.1043"></a> +<span class="sourceLineNo">1044</span> eof = true;<a name="line.1044"></a> +<span class="sourceLineNo">1045</span> return false;<a name="line.1045"></a> +<span class="sourceLineNo">1046</span> }<a name="line.1046"></a> +<span class="sourceLineNo">1047</span> // Inner multipart terminated -> Return to parsing the outer<a name="line.1047"></a> +<span class="sourceLineNo">1048</span> multi.setBoundary(boundary);<a name="line.1048"></a> +<span class="sourceLineNo">1049</span> currentFieldName = null;<a name="line.1049"></a> +<span class="sourceLineNo">1050</span> continue;<a name="line.1050"></a> +<span class="sourceLineNo">1051</span> }<a name="line.1051"></a> +<span class="sourceLineNo">1052</span> FileItemHeaders headers = getParsedHeaders(multi.readHeaders());<a name="line.1052"></a> +<span class="sourceLineNo">1053</span> if (currentFieldName == null) {<a name="line.1053"></a> +<span class="sourceLineNo">1054</span> // We're parsing the outer multipart<a name="line.1054"></a> +<span class="sourceLineNo">1055</span> String fieldName = getFieldName(headers);<a name="line.1055"></a> +<span class="sourceLineNo">1056</span> if (fieldName != null) {<a name="line.1056"></a> +<span class="sourceLineNo">1057</span> String subContentType = headers.getHeader(CONTENT_TYPE);<a name="line.1057"></a> +<span class="sourceLineNo">1058</span> if (subContentType != null<a name="line.1058"></a> +<span class="sourceLineNo">1059</span> && subContentType.toLowerCase(Locale.ENGLISH)<a name="line.1059"></a> +<span class="sourceLineNo">1060</span> .startsWith(MULTIPART_MIXED)) {<a name="line.1060"></a> +<span class="sourceLineNo">1061</span> currentFieldName = fieldName;<a name="line.1061"></a> +<span class="sourceLineNo">1062</span> // Multiple files associated with this field name<a name="line.1062"></a> +<span class="sourceLineNo">1063</span> byte[] subBoundary = getBoundary(subContentType);<a name="line.1063"></a> +<span class="sourceLineNo">1064</span> multi.setBoundary(subBoundary);<a name="line.1064"></a> +<span class="sourceLineNo">1065</span> skipPreamble = true;<a name="line.1065"></a> +<span class="sourceLineNo">1066</span> continue;<a name="line.1066"></a> +<span class="sourceLineNo">1067</span> }<a name="line.1067"></a> +<span class="sourceLineNo">1068</span> String fileName = getFileName(headers);<a name="line.1068"></a> +<span class="sourceLineNo">1069</span> currentItem = new FileItemStreamImpl(fileName,<a name="line.1069"></a> +<span class="sourceLineNo">1070</span> fieldName, headers.getHeader(CONTENT_TYPE),<a name="line.1070"></a> +<span class="sourceLineNo">1071</span> fileName == null, getContentLength(headers));<a name="line.1071"></a> +<span class="sourceLineNo">1072</span> currentItem.setHeaders(headers);<a name="line.1072"></a> +<span class="sourceLineNo">1073</span> notifier.noteItem();<a name="line.1073"></a> +<span class="sourceLineNo">1074</span> itemValid = true;<a name="line.1074"></a> +<span class="sourceLineNo">1075</span> return true;<a name="line.1075"></a> +<span class="sourceLineNo">1076</span> }<a name="line.1076"></a> +<span class="sourceLineNo">1077</span> } else {<a name="line.1077"></a> +<span class="sourceLineNo">1078</span> String fileName = getFileName(headers);<a name="line.1078"></a> +<span class="sourceLineNo">1079</span> if (fileName != null) {<a name="line.1079"></a> +<span class="sourceLineNo">1080</span> currentItem = new FileItemStreamImpl(fileName,<a name="line.1080"></a> +<span class="sourceLineNo">1081</span> currentFieldName,<a name="line.1081"></a> +<span class="sourceLineNo">1082</span> headers.getHeader(CONTENT_TYPE),<a name="line.1082"></a> +<span class="sourceLineNo">1083</span> false, getContentLength(headers));<a name="line.1083"></a> +<span class="sourceLineNo">1084</span> currentItem.setHeaders(headers);<a name="line.1084"></a> +<span class="sourceLineNo">1085</span> notifier.noteItem();<a name="line.1085"></a> +<span class="sourceLineNo">1086</span> itemValid = true;<a name="line.1086"></a> +<span class="sourceLineNo">1087</span> return true;<a name="line.1087"></a> +<span class="sourceLineNo">1088</span> }<a name="line.1088"></a> +<span class="sourceLineNo">1089</span> }<a name="line.1089"></a> +<span class="sourceLineNo">1090</span> multi.discardBodyData();<a name="line.1090"></a> +<span class="sourceLineNo">1091</span> }<a name="line.1091"></a> +<span class="sourceLineNo">1092</span> }<a name="line.1092"></a> +<span class="sourceLineNo">1093</span><a name="line.1093"></a> +<span class="sourceLineNo">1094</span> private long getContentLength(FileItemHeaders pHeaders) {<a name="line.1094"></a> +<span class="sourceLineNo">1095</span> try {<a name="line.1095"></a> +<span class="sourceLineNo">1096</span> return Long.parseLong(pHeaders.getHeader(CONTENT_LENGTH));<a name="line.1096"></a> +<span class="sourceLineNo">1097</span> } catch (Exception e) {<a name="line.1097"></a> +<span class="sourceLineNo">1098</span> return -1;<a name="line.1098"></a> +<span class="sourceLineNo">1099</span> }<a name="line.1099"></a> +<span class="sourceLineNo">1100</span> }<a name="line.1100"></a> +<span class="sourceLineNo">1101</span><a name="line.1101"></a> +<span class="sourceLineNo">1102</span> /**<a name="line.1102"></a> +<span class="sourceLineNo">1103</span> * Returns, whether another instance of {@link FileItemStream}<a name="line.1103"></a> +<span class="sourceLineNo">1104</span> * is available.<a name="line.1104"></a> +<span class="sourceLineNo">1105</span> *<a name="line.1105"></a> +<span class="sourceLineNo">1106</span> * @throws FileUploadException Parsing or processing the<a name="line.1106"></a> +<span class="sourceLineNo">1107</span> * file item failed.<a name="line.1107"></a> +<span class="sourceLineNo">1108</span> * @throws IOException Reading the file item failed.<a name="line.1108"></a> +<span class="sourceLineNo">1109</span> * @return True, if one or more additional file items<a name="line.1109"></a> +<span class="sourceLineNo">1110</span> * are available, otherwise false.<a name="line.1110"></a> +<span class="sourceLineNo">1111</span> */<a name="line.1111"></a> +<span class="sourceLineNo">1112</span> @Override<a name="line.1112"></a> +<span class="sourceLineNo">1113</span> public boolean hasNext() throws FileUploadException, IOException {<a name="line.1113"></a> +<span class="sourceLineNo">1114</span> if (eof) {<a name="line.1114"></a> +<span class="sourceLineNo">1115</span> return false;<a name="line.1115"></a> +<span class="sourceLineNo">1116</span> }<a name="line.1116"></a> +<span class="sourceLineNo">1117</span> if (itemValid) {<a name="line.1117"></a> +<span class="sourceLineNo">1118</span> return true;<a name="line.1118"></a> +<span class="sourceLineNo">1119</span> }<a name="line.1119"></a> +<span class="sourceLineNo">1120</span> try {<a name="line.1120"></a> +<span class="sourceLineNo">1121</span> return findNextItem();<a name="line.1121"></a> +<span class="sourceLineNo">1122</span> } catch (FileUploadIOException e) {<a name="line.1122"></a> +<span class="sourceLineNo">1123</span> // unwrap encapsulated SizeException<a name="line.1123"></a> +<span class="sourceLineNo">1124</span> throw (FileUploadException) e.getCause();<a name="line.1124"></a> +<span class="sourceLineNo">1125</span> }<a name="line.1125"></a> +<span class="sourceLineNo">1126</span> }<a name="line.1126"></a> +<span class="sourceLineNo">1127</span><a name="line.1127"></a> +<span class="sourceLineNo">1128</span> /**<a name="line.1128"></a> +<span class="sourceLineNo">1129</span> * Returns the next available {@link FileItemStream}.<a name="line.1129"></a> +<span class="sourceLineNo">1130</span> *<a name="line.1130"></a> +<span class="sourceLineNo">1131</span> * @throws java.util.NoSuchElementException No more items are<a name="line.1131"></a> +<span class="sourceLineNo">1132</span> * available. Use {@link #hasNext()} to prevent this exception.<a name="line.1132"></a> +<span class="sourceLineNo">1133</span> * @throws FileUploadException Parsing or processing the<a name="line.1133"></a> +<span class="sourceLineNo">1134</span> * file item failed.<a name="line.1134"></a> +<span class="sourceLineNo">1135</span> * @throws IOException Reading the file item failed.<a name="line.1135"></a> +<span class="sourceLineNo">1136</span> * @return FileItemStream instance, which provides<a name="line.1136"></a> +<span class="sourceLineNo">1137</span> * access to the next file item.<a name="line.1137"></a> +<span class="sourceLineNo">1138</span> */<a name="line.1138"></a> +<span class="sourceLineNo">1139</span> @Override<a name="line.1139"></a> +<span class="sourceLineNo">1140</span> public FileItemStream next() throws FileUploadException, IOException {<a name="line.1140"></a> +<span class="sourceLineNo">1141</span> if (eof || (!itemValid && !hasNext())) {<a name="line.1141"></a> +<span class="sourceLineNo">1142</span> throw new NoSuchElementException();<a name="line.1142"></a> +<span class="sourceLineNo">1143</span> }<a name="line.1143"></a> +<span class="sourceLineNo">1144</span> itemValid = false;<a name="line.1144"></a> +<span class="sourceLineNo">1145</span> return currentItem;<a name="line.1145"></a> +<span class="sourceLineNo">1146</span> }<a name="line.1146"></a> +<span class="sourceLineNo">1147</span><a name="line.1147"></a> +<span class="sourceLineNo">1148</span> }<a name="line.1148"></a> +<span class="sourceLineNo">1149</span><a name="line.1149"></a> +<span class="sourceLineNo">1150</span> /**<a name="line.1150"></a> +<span class="sourceLineNo">1151</span> * This exception is thrown for hiding an inner<a name="line.1151"></a> +<span class="sourceLineNo">1152</span> * {@link FileUploadException} in an {@link IOException}.<a name="line.1152"></a> +<span class="sourceLineNo">1153</span> */<a name="line.1153"></a> +<span class="sourceLineNo">1154</span> public static class FileUploadIOException extends IOException {<a name="line.1154"></a> <span class="sourceLineNo">1155</span><a name="line.1155"></a> <span class="sourceLineNo">1156</span> /**<a name="line.1156"></a> -<span class="sourceLineNo">1157</span> * Creates a <code>FileUploadIOException</code> with the<a name="line.1157"></a> -<span class="sourceLineNo">1158</span> * given cause.<a name="line.1158"></a> -<span class="sourceLineNo">1159</span> *<a name="line.1159"></a> -<span class="sourceLineNo">1160</span> * @param pCause The exceptions cause, if any, or null.<a name="line.1160"></a> -<span class="sourceLineNo">1161</span> */<a name="line.1161"></a> -<span class="sourceLineNo">1162</span> public FileUploadIOException(FileUploadException pCause) {<a name="line.1162"></a> -<span class="sourceLineNo">1163</span> // We're not doing super(pCause) cause of 1.3 compatibility.<a name="line.1163"></a> -<span class="sourceLineNo">1164</span> cause = pCause;<a name="line.1164"></a> -<span class="sourceLineNo">1165</span> }<a name="line.1165"></a> -<span class="sourceLineNo">1166</span><a name="line.1166"></a> -<span class="sourceLineNo">1167</span> /**<a name="line.1167"></a> -<span class="sourceLineNo">1168</span> * Returns the exceptions cause.<a name="line.1168"></a> -<span class="sourceLineNo">1169</span> *<a name="line.1169"></a> -<span class="sourceLineNo">1170</span> * @return The exceptions cause, if any, or null.<a name="line.1170"></a> -<span class="sourceLineNo">1171</span> */<a name="line.1171"></a> -<span class="sourceLineNo">1172</span> @Override<a name="line.1172"></a> -<span class="sourceLineNo">1173</span> public Throwable getCause() {<a name="line.1173"></a> -<span class="sourceLineNo">1174</span> return cause;<a name="line.1174"></a> -<span class="sourceLineNo">1175</span> }<a name="line.1175"></a> -<span class="sourceLineNo">1176</span><a name="line.1176"></a> -<span class="sourceLineNo">1177</span> }<a name="line.1177"></a> +<span class="sourceLineNo">1157</span> * The exceptions UID, for serializing an instance.<a name="line.1157"></a> +<span class="sourceLineNo">1158</span> */<a name="line.1158"></a> +<span class="sourceLineNo">1159</span> private static final long serialVersionUID = -7047616958165584154L;<a name="line.1159"></a> +<span class="sourceLineNo">1160</span><a name="line.1160"></a> +<span class="sourceLineNo">1161</span> /**<a name="line.1161"></a> +<span class="sourceLineNo">1162</span> * The exceptions cause; we overwrite the parent<a name="line.1162"></a> +<span class="sourceLineNo">1163</span> * classes field, which is available since Java<a name="line.1163"></a> +<span class="sourceLineNo">1164</span> * 1.4 only.<a name="line.1164"></a> +<span class="sourceLineNo">1165</span> */<a name="line.1165"></a> +<span class="sourceLineNo">1166</span> private final FileUploadException cause;<a name="line.1166"></a> +<span class="sourceLineNo">1167</span><a name="line.1167"></a> +<span class="sourceLineNo">1168</span> /**<a name="line.1168"></a> +<span class="sourceLineNo">1169</span> * Creates a <code>FileUploadIOException</code> with the<a name="line.1169"></a> +<span class="sourceLineNo">1170</span> * given cause.<a name="line.1170"></a> +<span class="sourceLineNo">1171</span> *<a name="line.1171"></a> +<span class="sourceLineNo">1172</span> * @param pCause The exceptions cause, if any, or null.<a name="line.1172"></a> +<span class="sourceLineNo">1173</span> */<a name="line.1173"></a> +<span class="sourceLineNo">1174</span> public FileUploadIOException(FileUploadException pCause) {<a name="line.1174"></a> +<span class="sourceLineNo">1175</span> // We're not doing super(pCause) cause of 1.3 compatibility.<a name="line.1175"></a> +<span class="sourceLineNo">1176</span> cause = pCause;<a name="line.1176"></a> +<span class="sourceLineNo">1177</span> }<a name="line.1177"></a> <span class="sourceLineNo">1178</span><a name="line.1178"></a> -<span class="sourceLineNo">1179</span> /**<a name="line.1179"></a> -<span class="sourceLineNo">1180</span> * Thrown to indicate that the request is not a multipart request.<a name="line.1180"></a> -<span class="sourceLineNo">1181</span> */<a name="line.1181"></a> -<span class="sourceLineNo">1182</span> public static class InvalidContentTypeException<a name="line.1182"></a> -<span class="sourceLineNo">1183</span> extends FileUploadException {<a name="line.1183"></a> -<span class="sourceLineNo">1184</span><a name="line.1184"></a> -<span class="sourceLineNo">1185</span> /**<a name="line.1185"></a> -<span class="sourceLineNo">1186</span> * The exceptions UID, for serializing an instance.<a name="line.1186"></a> -<span class="sourceLineNo">1187</span> */<a name="line.1187"></a> -<span class="sourceLineNo">1188</span> private static final long serialVersionUID = -9073026332015646668L;<a name="line.1188"></a> -<span class="sourceLineNo">1189</span><a name="line.1189"></a> -<span class="sourceLineNo">1190</span> /**<a name="line.1190"></a> -<span class="sourceLineNo">1191</span> * Constructs a <code>InvalidContentTypeException</code> with no<a name="line.1191"></a> -<span class="sourceLineNo">1192</span> * detail message.<a name="line.1192"></a> -<span class="sourceLineNo">1193</span> */<a name="line.1193"></a> -<span class="sourceLineNo">1194</span> public InvalidContentTypeException() {<a name="line.1194"></a> -<span class="sourceLineNo">1195</span> super();<a name="line.1195"></a> -<span class="sourceLineNo">1196</span> }<a name="line.1196"></a> -<span class="sourceLineNo">1197</span><a name="line.1197"></a> -<span class="sourceLineNo">1198</span> /**<a name="line.1198"></a> -<span class="sourceLineNo">1199</span> * Constructs an <code>InvalidContentTypeException</code> with<a name="line.1199"></a> -<span class="sourceLineNo">1200</span> * the specified detail message.<a name="line.1200"></a> -<span class="sourceLineNo">1201</span> *<a name="line.1201"></a> -<span class="sourceLineNo">1202</span> * @param message The detail message.<a name="line.1202"></a> -<span class="sourceLineNo">1203</span> */<a name="line.1203"></a> -<span class="sourceLineNo">1204</span> public InvalidContentTypeException(String message) {<a name="line.1204"></a> -<span class="sourceLineNo">1205</span> super(message);<a name="line.1205"></a> -<span class="sourceLineNo">1206</span> }<a name="line.1206"></a> -<span class="sourceLineNo">1207</span><a name="line.1207"></a> -<span class="sourceLineNo">1208</span> /**<a name="line.1208"></a> -<span class="sourceLineNo">1209</span> * Constructs an <code>InvalidContentTypeException</code> with<a name="line.1209"></a> -<span class="sourceLineNo">1210</span> * the specified detail message and cause.<a name="line.1210"></a> -<span class="sourceLineNo">1211</span> *<a name="line.1211"></a> -<span class="sourceLineNo">1212</span> * @param msg The detail message.<a name="line.1212"></a> -<span class="sourceLineNo">1213</span> * @param cause the original cause<a name="line.1213"></a> -<span class="sourceLineNo">1214</span> *<a name="line.1214"></a> -<span class="sourceLineNo">1215</span> * @since 1.3.1<a name="line.1215"></a> -<span class="sourceLineNo">1216</span> */<a name="line.1216"></a> -<span class="sourceLineNo">1217</span> public InvalidContentTypeException(String msg, Throwable cause) {<a name="line.1217"></a> -<span class="sourceLineNo">1218</span> super(msg, cause);<a name="line.1218"></a> -<span class="sourceLineNo">1219</span> }<a name="line.1219"></a> -<span class="sourceLineNo">1220</span> }<a name="line.1220"></a> -<span class="sourceLineNo">1221</span><a name="line.1221"></a> -<span class="sourceLineNo">1222</span> /**<a name="line.1222"></a> -<span class="sourceLineNo">1223</span> * Thrown to indicate an IOException.<a name="line.1223"></a> -<span class="sourceLineNo">1224</span> */<a name="line.1224"></a> -<span class="sourceLineNo">1225</span> public static class IOFileUploadException extends FileUploadException {<a name="line.1225"></a> -<span class="sourceLineNo">1226</span><a name="line.1226"></a> -<span class="sourceLineNo">1227</span> /**<a name="line.1227"></a> -<span class="sourceLineNo">1228</span> * The exceptions UID, for serializing an instance.<a name="line.1228"></a> -<span class="sourceLineNo">1229</span> */<a name="line.1229"></a> -<span class="sourceLineNo">1230</span> private static final long serialVersionUID = 1749796615868477269L;<a name="line.1230"></a> -<span class="sourceLineNo">1231</span><a name="line.1231"></a> -<span class="sourceLineNo">1232</span> /**<a name="line.1232"></a> -<span class="sourceLineNo">1233</span> * The exceptions cause; we overwrite the parent<a name="line.1233"></a> -<span class="sourceLineNo">1234</span> * classes field, which is available since Java<a name="line.1234"></a> -<span class="sourceLineNo">1235</span> * 1.4 only.<a name="line.1235"></a> -<span class="sourceLineNo">1236</span> */<a name="line.1236"></a> -<span class="sourceLineNo">1237</span> private final IOException cause;<a name="line.1237"></a> +<span class="sourceLineNo">1179</span> /**<a name="line.1179"></a> +<span class="sourceLineNo">1180</span> * Returns the exceptions cause.<a name="line.1180"></a> +<span class="sourceLineNo">1181</span> *<a name="line.1181"></a> +<span class="sourceLineNo">1182</span> * @return The exceptions cause, if any, or null.<a name="line.1182"></a> +<span class="sourceLineNo">1183</span> */<a name="line.1183"></a> +<span class="sourceLineNo">1184</span> @Override<a name="line.1184"></a> +<span class="sourceLineNo">1185</span> public Throwable getCause() {<a name="line.1185"></a> +<span class="sourceLineNo">1186</span> return cause;<a name="line.1186"></a> +<span class="sourceLineNo">1187</span> }<a name="line.1187"></a> +<span class="sourceLineNo">1188</span><a name="line.1188"></a> +<span class="sourceLineNo">1189</span> }<a name="line.1189"></a> +<span class="sourceLineNo">1190</span><a name="line.1190"></a> +<span class="sourceLineNo">1191</span> /**<a name="line.1191"></a> +<span class="sourceLineNo">1192</span> * Thrown to indicate that the request is not a multipart request.<a name="line.1192"></a> +<span class="sourceLineNo">1193</span> */<a name="line.1193"></a> +<span class="sourceLineNo">1194</span> public static class InvalidContentTypeException<a name="line.1194"></a> +<span class="sourceLineNo">1195</span> extends FileUploadException {<a name="line.1195"></a> +<span class="sourceLineNo">1196</span><a name="line.1196"></a> +<span class="sourceLineNo">1197</span> /**<a name="line.1197"></a> +<span class="sourceLineNo">1198</span> * The exceptions UID, for serializing an instance.<a name="line.1198"></a> +<span class="sourceLineNo">1199</span> */<a name="line.1199"></a> +<span class="sourceLineNo">1200</span> private static final long serialVersionUID = -9073026332015646668L;<a name="line.1200"></a> +<span class="sourceLineNo">1201</span><a name="line.1201"></a> +<span class="sourceLineNo">1202</span> /**<a name="line.1202"></a> +<span class="sourceLineNo">1203</span> * Constructs a <code>InvalidContentTypeException</code> with no<a name="line.1203"></a> +<span class="sourceLineNo">1204</span> * detail message.<a name="line.1204"></a> +<span class="sourceLineNo">1205</span> */<a name="line.1205"></a>
[... 557 lines stripped ...]
