commons-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chtom...@apache.org
Subject svn commit: r1013975 [5/26] - in /websites/production/commons/content/proper/commons-fileupload: ./ apidocs/ apidocs/org/apache/commons/fileupload/ apidocs/org/apache/commons/fileupload/class-use/ apidocs/org/apache/commons/fileupload/disk/ apidocs/org...
Date Tue, 13 Jun 2017 12:53:22 GMT
Modified: websites/production/commons/content/proper/commons-fileupload/apidocs/src-html/org/apache/commons/fileupload/MultipartStream.ItemInputStream.html
==============================================================================
--- websites/production/commons/content/proper/commons-fileupload/apidocs/src-html/org/apache/commons/fileupload/MultipartStream.ItemInputStream.html (original)
+++ websites/production/commons/content/proper/commons-fileupload/apidocs/src-html/org/apache/commons/fileupload/MultipartStream.ItemInputStream.html Tue Jun 13 12:53:17 2017
@@ -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">
@@ -238,805 +238,836 @@
 <span class="sourceLineNo">230</span>    private final byte[] boundary;<a name="line.230"></a>
 <span class="sourceLineNo">231</span><a name="line.231"></a>
 <span class="sourceLineNo">232</span>    /**<a name="line.232"></a>
-<span class="sourceLineNo">233</span>     * The length of the buffer used for processing the request.<a name="line.233"></a>
+<span class="sourceLineNo">233</span>     * The table for Knuth-Morris-Pratt search algorithm<a name="line.233"></a>
 <span class="sourceLineNo">234</span>     */<a name="line.234"></a>
-<span class="sourceLineNo">235</span>    private final int bufSize;<a name="line.235"></a>
+<span class="sourceLineNo">235</span>    private int[] boundaryTable;<a name="line.235"></a>
 <span class="sourceLineNo">236</span><a name="line.236"></a>
 <span class="sourceLineNo">237</span>    /**<a name="line.237"></a>
-<span class="sourceLineNo">238</span>     * The buffer used for processing the request.<a name="line.238"></a>
+<span class="sourceLineNo">238</span>     * The length of the buffer used for processing the request.<a name="line.238"></a>
 <span class="sourceLineNo">239</span>     */<a name="line.239"></a>
-<span class="sourceLineNo">240</span>    private final byte[] buffer;<a name="line.240"></a>
+<span class="sourceLineNo">240</span>    private final int bufSize;<a name="line.240"></a>
 <span class="sourceLineNo">241</span><a name="line.241"></a>
 <span class="sourceLineNo">242</span>    /**<a name="line.242"></a>
-<span class="sourceLineNo">243</span>     * The index of first valid character in the buffer.<a name="line.243"></a>
-<span class="sourceLineNo">244</span>     * &lt;br&gt;<a name="line.244"></a>
-<span class="sourceLineNo">245</span>     * 0 &lt;= head &lt; bufSize<a name="line.245"></a>
-<span class="sourceLineNo">246</span>     */<a name="line.246"></a>
-<span class="sourceLineNo">247</span>    private int head;<a name="line.247"></a>
-<span class="sourceLineNo">248</span><a name="line.248"></a>
-<span class="sourceLineNo">249</span>    /**<a name="line.249"></a>
-<span class="sourceLineNo">250</span>     * The index of last valid character in the buffer + 1.<a name="line.250"></a>
-<span class="sourceLineNo">251</span>     * &lt;br&gt;<a name="line.251"></a>
-<span class="sourceLineNo">252</span>     * 0 &lt;= tail &lt;= bufSize<a name="line.252"></a>
-<span class="sourceLineNo">253</span>     */<a name="line.253"></a>
-<span class="sourceLineNo">254</span>    private int tail;<a name="line.254"></a>
-<span class="sourceLineNo">255</span><a name="line.255"></a>
-<span class="sourceLineNo">256</span>    /**<a name="line.256"></a>
-<span class="sourceLineNo">257</span>     * The content encoding to use when reading headers.<a name="line.257"></a>
+<span class="sourceLineNo">243</span>     * The buffer used for processing the request.<a name="line.243"></a>
+<span class="sourceLineNo">244</span>     */<a name="line.244"></a>
+<span class="sourceLineNo">245</span>    private final byte[] buffer;<a name="line.245"></a>
+<span class="sourceLineNo">246</span><a name="line.246"></a>
+<span class="sourceLineNo">247</span>    /**<a name="line.247"></a>
+<span class="sourceLineNo">248</span>     * The index of first valid character in the buffer.<a name="line.248"></a>
+<span class="sourceLineNo">249</span>     * &lt;br&gt;<a name="line.249"></a>
+<span class="sourceLineNo">250</span>     * 0 &lt;= head &lt; bufSize<a name="line.250"></a>
+<span class="sourceLineNo">251</span>     */<a name="line.251"></a>
+<span class="sourceLineNo">252</span>    private int head;<a name="line.252"></a>
+<span class="sourceLineNo">253</span><a name="line.253"></a>
+<span class="sourceLineNo">254</span>    /**<a name="line.254"></a>
+<span class="sourceLineNo">255</span>     * The index of last valid character in the buffer + 1.<a name="line.255"></a>
+<span class="sourceLineNo">256</span>     * &lt;br&gt;<a name="line.256"></a>
+<span class="sourceLineNo">257</span>     * 0 &lt;= tail &lt;= bufSize<a name="line.257"></a>
 <span class="sourceLineNo">258</span>     */<a name="line.258"></a>
-<span class="sourceLineNo">259</span>    private String headerEncoding;<a name="line.259"></a>
+<span class="sourceLineNo">259</span>    private int tail;<a name="line.259"></a>
 <span class="sourceLineNo">260</span><a name="line.260"></a>
 <span class="sourceLineNo">261</span>    /**<a name="line.261"></a>
-<span class="sourceLineNo">262</span>     * The progress notifier, if any, or null.<a name="line.262"></a>
+<span class="sourceLineNo">262</span>     * The content encoding to use when reading headers.<a name="line.262"></a>
 <span class="sourceLineNo">263</span>     */<a name="line.263"></a>
-<span class="sourceLineNo">264</span>    private final ProgressNotifier notifier;<a name="line.264"></a>
+<span class="sourceLineNo">264</span>    private String headerEncoding;<a name="line.264"></a>
 <span class="sourceLineNo">265</span><a name="line.265"></a>
-<span class="sourceLineNo">266</span>    // ----------------------------------------------------------- Constructors<a name="line.266"></a>
-<span class="sourceLineNo">267</span><a name="line.267"></a>
-<span class="sourceLineNo">268</span>    /**<a name="line.268"></a>
-<span class="sourceLineNo">269</span>     * Creates a new instance.<a name="line.269"></a>
-<span class="sourceLineNo">270</span>     *<a name="line.270"></a>
-<span class="sourceLineNo">271</span>     * @deprecated 1.2.1 Use {@link #MultipartStream(InputStream, byte[], int,<a name="line.271"></a>
-<span class="sourceLineNo">272</span>     * ProgressNotifier)}<a name="line.272"></a>
-<span class="sourceLineNo">273</span>     */<a name="line.273"></a>
-<span class="sourceLineNo">274</span>    @Deprecated<a name="line.274"></a>
-<span class="sourceLineNo">275</span>    public MultipartStream() {<a name="line.275"></a>
-<span class="sourceLineNo">276</span>        this(null, null, null);<a name="line.276"></a>
-<span class="sourceLineNo">277</span>    }<a name="line.277"></a>
-<span class="sourceLineNo">278</span><a name="line.278"></a>
-<span class="sourceLineNo">279</span>    /**<a name="line.279"></a>
-<span class="sourceLineNo">280</span>     * &lt;p&gt; Constructs a &lt;code&gt;MultipartStream&lt;/code&gt; with a custom size buffer<a name="line.280"></a>
-<span class="sourceLineNo">281</span>     * and no progress notifier.<a name="line.281"></a>
-<span class="sourceLineNo">282</span>     *<a name="line.282"></a>
-<span class="sourceLineNo">283</span>     * &lt;p&gt; Note that the buffer must be at least big enough to contain the<a name="line.283"></a>
-<span class="sourceLineNo">284</span>     * boundary string, plus 4 characters for CR/LF and double dash, plus at<a name="line.284"></a>
-<span class="sourceLineNo">285</span>     * least one byte of data.  Too small a buffer size setting will degrade<a name="line.285"></a>
-<span class="sourceLineNo">286</span>     * performance.<a name="line.286"></a>
+<span class="sourceLineNo">266</span>    /**<a name="line.266"></a>
+<span class="sourceLineNo">267</span>     * The progress notifier, if any, or null.<a name="line.267"></a>
+<span class="sourceLineNo">268</span>     */<a name="line.268"></a>
+<span class="sourceLineNo">269</span>    private final ProgressNotifier notifier;<a name="line.269"></a>
+<span class="sourceLineNo">270</span><a name="line.270"></a>
+<span class="sourceLineNo">271</span>    // ----------------------------------------------------------- Constructors<a name="line.271"></a>
+<span class="sourceLineNo">272</span><a name="line.272"></a>
+<span class="sourceLineNo">273</span>    /**<a name="line.273"></a>
+<span class="sourceLineNo">274</span>     * Creates a new instance.<a name="line.274"></a>
+<span class="sourceLineNo">275</span>     *<a name="line.275"></a>
+<span class="sourceLineNo">276</span>     * @deprecated 1.2.1 Use {@link #MultipartStream(InputStream, byte[], int,<a name="line.276"></a>
+<span class="sourceLineNo">277</span>     * ProgressNotifier)}<a name="line.277"></a>
+<span class="sourceLineNo">278</span>     */<a name="line.278"></a>
+<span class="sourceLineNo">279</span>    @Deprecated<a name="line.279"></a>
+<span class="sourceLineNo">280</span>    public MultipartStream() {<a name="line.280"></a>
+<span class="sourceLineNo">281</span>        this(null, null, null);<a name="line.281"></a>
+<span class="sourceLineNo">282</span>    }<a name="line.282"></a>
+<span class="sourceLineNo">283</span><a name="line.283"></a>
+<span class="sourceLineNo">284</span>    /**<a name="line.284"></a>
+<span class="sourceLineNo">285</span>     * &lt;p&gt; Constructs a &lt;code&gt;MultipartStream&lt;/code&gt; with a custom size buffer<a name="line.285"></a>
+<span class="sourceLineNo">286</span>     * and no progress notifier.<a name="line.286"></a>
 <span class="sourceLineNo">287</span>     *<a name="line.287"></a>
-<span class="sourceLineNo">288</span>     * @param input    The &lt;code&gt;InputStream&lt;/code&gt; to serve as a data source.<a name="line.288"></a>
-<span class="sourceLineNo">289</span>     * @param boundary The token used for dividing the stream into<a name="line.289"></a>
-<span class="sourceLineNo">290</span>     *                 &lt;code&gt;encapsulations&lt;/code&gt;.<a name="line.290"></a>
-<span class="sourceLineNo">291</span>     * @param bufSize  The size of the buffer to be used, in bytes.<a name="line.291"></a>
+<span class="sourceLineNo">288</span>     * &lt;p&gt; Note that the buffer must be at least big enough to contain the<a name="line.288"></a>
+<span class="sourceLineNo">289</span>     * boundary string, plus 4 characters for CR/LF and double dash, plus at<a name="line.289"></a>
+<span class="sourceLineNo">290</span>     * least one byte of data.  Too small a buffer size setting will degrade<a name="line.290"></a>
+<span class="sourceLineNo">291</span>     * performance.<a name="line.291"></a>
 <span class="sourceLineNo">292</span>     *<a name="line.292"></a>
-<span class="sourceLineNo">293</span>     * @deprecated 1.2.1 Use {@link #MultipartStream(InputStream, byte[], int,<a name="line.293"></a>
-<span class="sourceLineNo">294</span>     * ProgressNotifier)}.<a name="line.294"></a>
-<span class="sourceLineNo">295</span>     */<a name="line.295"></a>
-<span class="sourceLineNo">296</span>    @Deprecated<a name="line.296"></a>
-<span class="sourceLineNo">297</span>    public MultipartStream(InputStream input, byte[] boundary, int bufSize) {<a name="line.297"></a>
-<span class="sourceLineNo">298</span>        this(input, boundary, bufSize, null);<a name="line.298"></a>
-<span class="sourceLineNo">299</span>    }<a name="line.299"></a>
-<span class="sourceLineNo">300</span><a name="line.300"></a>
-<span class="sourceLineNo">301</span>    /**<a name="line.301"></a>
-<span class="sourceLineNo">302</span>     * &lt;p&gt; Constructs a &lt;code&gt;MultipartStream&lt;/code&gt; with a custom size buffer.<a name="line.302"></a>
-<span class="sourceLineNo">303</span>     *<a name="line.303"></a>
-<span class="sourceLineNo">304</span>     * &lt;p&gt; Note that the buffer must be at least big enough to contain the<a name="line.304"></a>
-<span class="sourceLineNo">305</span>     * boundary string, plus 4 characters for CR/LF and double dash, plus at<a name="line.305"></a>
-<span class="sourceLineNo">306</span>     * least one byte of data.  Too small a buffer size setting will degrade<a name="line.306"></a>
-<span class="sourceLineNo">307</span>     * performance.<a name="line.307"></a>
+<span class="sourceLineNo">293</span>     * @param input    The &lt;code&gt;InputStream&lt;/code&gt; to serve as a data source.<a name="line.293"></a>
+<span class="sourceLineNo">294</span>     * @param boundary The token used for dividing the stream into<a name="line.294"></a>
+<span class="sourceLineNo">295</span>     *                 &lt;code&gt;encapsulations&lt;/code&gt;.<a name="line.295"></a>
+<span class="sourceLineNo">296</span>     * @param bufSize  The size of the buffer to be used, in bytes.<a name="line.296"></a>
+<span class="sourceLineNo">297</span>     *<a name="line.297"></a>
+<span class="sourceLineNo">298</span>     * @deprecated 1.2.1 Use {@link #MultipartStream(InputStream, byte[], int,<a name="line.298"></a>
+<span class="sourceLineNo">299</span>     * ProgressNotifier)}.<a name="line.299"></a>
+<span class="sourceLineNo">300</span>     */<a name="line.300"></a>
+<span class="sourceLineNo">301</span>    @Deprecated<a name="line.301"></a>
+<span class="sourceLineNo">302</span>    public MultipartStream(InputStream input, byte[] boundary, int bufSize) {<a name="line.302"></a>
+<span class="sourceLineNo">303</span>        this(input, boundary, bufSize, null);<a name="line.303"></a>
+<span class="sourceLineNo">304</span>    }<a name="line.304"></a>
+<span class="sourceLineNo">305</span><a name="line.305"></a>
+<span class="sourceLineNo">306</span>    /**<a name="line.306"></a>
+<span class="sourceLineNo">307</span>     * &lt;p&gt; Constructs a &lt;code&gt;MultipartStream&lt;/code&gt; with a custom size buffer.<a name="line.307"></a>
 <span class="sourceLineNo">308</span>     *<a name="line.308"></a>
-<span class="sourceLineNo">309</span>     * @param input    The &lt;code&gt;InputStream&lt;/code&gt; to serve as a data source.<a name="line.309"></a>
-<span class="sourceLineNo">310</span>     * @param boundary The token used for dividing the stream into<a name="line.310"></a>
-<span class="sourceLineNo">311</span>     *                 &lt;code&gt;encapsulations&lt;/code&gt;.<a name="line.311"></a>
-<span class="sourceLineNo">312</span>     * @param bufSize  The size of the buffer to be used, in bytes.<a name="line.312"></a>
-<span class="sourceLineNo">313</span>     * @param pNotifier The notifier, which is used for calling the<a name="line.313"></a>
-<span class="sourceLineNo">314</span>     *                  progress listener, if any.<a name="line.314"></a>
-<span class="sourceLineNo">315</span>     *<a name="line.315"></a>
-<span class="sourceLineNo">316</span>     * @throws IllegalArgumentException If the buffer size is too small<a name="line.316"></a>
-<span class="sourceLineNo">317</span>     *<a name="line.317"></a>
-<span class="sourceLineNo">318</span>     * @since 1.3.1<a name="line.318"></a>
-<span class="sourceLineNo">319</span>     */<a name="line.319"></a>
-<span class="sourceLineNo">320</span>    public MultipartStream(InputStream input,<a name="line.320"></a>
-<span class="sourceLineNo">321</span>            byte[] boundary,<a name="line.321"></a>
-<span class="sourceLineNo">322</span>            int bufSize,<a name="line.322"></a>
-<span class="sourceLineNo">323</span>            ProgressNotifier pNotifier) {<a name="line.323"></a>
-<span class="sourceLineNo">324</span><a name="line.324"></a>
-<span class="sourceLineNo">325</span>        if (boundary == null) {<a name="line.325"></a>
-<span class="sourceLineNo">326</span>            throw new IllegalArgumentException("boundary may not be null");<a name="line.326"></a>
-<span class="sourceLineNo">327</span>        }<a name="line.327"></a>
-<span class="sourceLineNo">328</span>        // We prepend CR/LF to the boundary to chop trailing CR/LF from<a name="line.328"></a>
-<span class="sourceLineNo">329</span>        // body-data tokens.<a name="line.329"></a>
-<span class="sourceLineNo">330</span>        this.boundaryLength = boundary.length + BOUNDARY_PREFIX.length;<a name="line.330"></a>
-<span class="sourceLineNo">331</span>        if (bufSize &lt; this.boundaryLength + 1) {<a name="line.331"></a>
-<span class="sourceLineNo">332</span>            throw new IllegalArgumentException(<a name="line.332"></a>
-<span class="sourceLineNo">333</span>                    "The buffer size specified for the MultipartStream is too small");<a name="line.333"></a>
-<span class="sourceLineNo">334</span>        }<a name="line.334"></a>
-<span class="sourceLineNo">335</span><a name="line.335"></a>
-<span class="sourceLineNo">336</span>        this.input = input;<a name="line.336"></a>
-<span class="sourceLineNo">337</span>        this.bufSize = Math.max(bufSize, boundaryLength*2);<a name="line.337"></a>
-<span class="sourceLineNo">338</span>        this.buffer = new byte[this.bufSize];<a name="line.338"></a>
-<span class="sourceLineNo">339</span>        this.notifier = pNotifier;<a name="line.339"></a>
+<span class="sourceLineNo">309</span>     * &lt;p&gt; Note that the buffer must be at least big enough to contain the<a name="line.309"></a>
+<span class="sourceLineNo">310</span>     * boundary string, plus 4 characters for CR/LF and double dash, plus at<a name="line.310"></a>
+<span class="sourceLineNo">311</span>     * least one byte of data.  Too small a buffer size setting will degrade<a name="line.311"></a>
+<span class="sourceLineNo">312</span>     * performance.<a name="line.312"></a>
+<span class="sourceLineNo">313</span>     *<a name="line.313"></a>
+<span class="sourceLineNo">314</span>     * @param input    The &lt;code&gt;InputStream&lt;/code&gt; to serve as a data source.<a name="line.314"></a>
+<span class="sourceLineNo">315</span>     * @param boundary The token used for dividing the stream into<a name="line.315"></a>
+<span class="sourceLineNo">316</span>     *                 &lt;code&gt;encapsulations&lt;/code&gt;.<a name="line.316"></a>
+<span class="sourceLineNo">317</span>     * @param bufSize  The size of the buffer to be used, in bytes.<a name="line.317"></a>
+<span class="sourceLineNo">318</span>     * @param pNotifier The notifier, which is used for calling the<a name="line.318"></a>
+<span class="sourceLineNo">319</span>     *                  progress listener, if any.<a name="line.319"></a>
+<span class="sourceLineNo">320</span>     *<a name="line.320"></a>
+<span class="sourceLineNo">321</span>     * @throws IllegalArgumentException If the buffer size is too small<a name="line.321"></a>
+<span class="sourceLineNo">322</span>     *<a name="line.322"></a>
+<span class="sourceLineNo">323</span>     * @since 1.3.1<a name="line.323"></a>
+<span class="sourceLineNo">324</span>     */<a name="line.324"></a>
+<span class="sourceLineNo">325</span>    public MultipartStream(InputStream input,<a name="line.325"></a>
+<span class="sourceLineNo">326</span>            byte[] boundary,<a name="line.326"></a>
+<span class="sourceLineNo">327</span>            int bufSize,<a name="line.327"></a>
+<span class="sourceLineNo">328</span>            ProgressNotifier pNotifier) {<a name="line.328"></a>
+<span class="sourceLineNo">329</span><a name="line.329"></a>
+<span class="sourceLineNo">330</span>        if (boundary == null) {<a name="line.330"></a>
+<span class="sourceLineNo">331</span>            throw new IllegalArgumentException("boundary may not be null");<a name="line.331"></a>
+<span class="sourceLineNo">332</span>        }<a name="line.332"></a>
+<span class="sourceLineNo">333</span>        // We prepend CR/LF to the boundary to chop trailing CR/LF from<a name="line.333"></a>
+<span class="sourceLineNo">334</span>        // body-data tokens.<a name="line.334"></a>
+<span class="sourceLineNo">335</span>        this.boundaryLength = boundary.length + BOUNDARY_PREFIX.length;<a name="line.335"></a>
+<span class="sourceLineNo">336</span>        if (bufSize &lt; this.boundaryLength + 1) {<a name="line.336"></a>
+<span class="sourceLineNo">337</span>            throw new IllegalArgumentException(<a name="line.337"></a>
+<span class="sourceLineNo">338</span>                    "The buffer size specified for the MultipartStream is too small");<a name="line.338"></a>
+<span class="sourceLineNo">339</span>        }<a name="line.339"></a>
 <span class="sourceLineNo">340</span><a name="line.340"></a>
-<span class="sourceLineNo">341</span>        this.boundary = new byte[this.boundaryLength];<a name="line.341"></a>
-<span class="sourceLineNo">342</span>        this.keepRegion = this.boundary.length;<a name="line.342"></a>
-<span class="sourceLineNo">343</span><a name="line.343"></a>
-<span class="sourceLineNo">344</span>        System.arraycopy(BOUNDARY_PREFIX, 0, this.boundary, 0,<a name="line.344"></a>
-<span class="sourceLineNo">345</span>                BOUNDARY_PREFIX.length);<a name="line.345"></a>
-<span class="sourceLineNo">346</span>        System.arraycopy(boundary, 0, this.boundary, BOUNDARY_PREFIX.length,<a name="line.346"></a>
-<span class="sourceLineNo">347</span>                boundary.length);<a name="line.347"></a>
-<span class="sourceLineNo">348</span><a name="line.348"></a>
-<span class="sourceLineNo">349</span>        head = 0;<a name="line.349"></a>
-<span class="sourceLineNo">350</span>        tail = 0;<a name="line.350"></a>
-<span class="sourceLineNo">351</span>    }<a name="line.351"></a>
-<span class="sourceLineNo">352</span><a name="line.352"></a>
-<span class="sourceLineNo">353</span>    /**<a name="line.353"></a>
-<span class="sourceLineNo">354</span>     * &lt;p&gt; Constructs a &lt;code&gt;MultipartStream&lt;/code&gt; with a default size buffer.<a name="line.354"></a>
-<span class="sourceLineNo">355</span>     *<a name="line.355"></a>
-<span class="sourceLineNo">356</span>     * @param input    The &lt;code&gt;InputStream&lt;/code&gt; to serve as a data source.<a name="line.356"></a>
-<span class="sourceLineNo">357</span>     * @param boundary The token used for dividing the stream into<a name="line.357"></a>
-<span class="sourceLineNo">358</span>     *                 &lt;code&gt;encapsulations&lt;/code&gt;.<a name="line.358"></a>
-<span class="sourceLineNo">359</span>     * @param pNotifier An object for calling the progress listener, if any.<a name="line.359"></a>
-<span class="sourceLineNo">360</span>     *<a name="line.360"></a>
-<span class="sourceLineNo">361</span>     *<a name="line.361"></a>
-<span class="sourceLineNo">362</span>     * @see #MultipartStream(InputStream, byte[], int, ProgressNotifier)<a name="line.362"></a>
-<span class="sourceLineNo">363</span>     */<a name="line.363"></a>
-<span class="sourceLineNo">364</span>    MultipartStream(InputStream input,<a name="line.364"></a>
-<span class="sourceLineNo">365</span>            byte[] boundary,<a name="line.365"></a>
-<span class="sourceLineNo">366</span>            ProgressNotifier pNotifier) {<a name="line.366"></a>
-<span class="sourceLineNo">367</span>        this(input, boundary, DEFAULT_BUFSIZE, pNotifier);<a name="line.367"></a>
-<span class="sourceLineNo">368</span>    }<a name="line.368"></a>
-<span class="sourceLineNo">369</span><a name="line.369"></a>
-<span class="sourceLineNo">370</span>    /**<a name="line.370"></a>
-<span class="sourceLineNo">371</span>     * &lt;p&gt; Constructs a &lt;code&gt;MultipartStream&lt;/code&gt; with a default size buffer.<a name="line.371"></a>
-<span class="sourceLineNo">372</span>     *<a name="line.372"></a>
-<span class="sourceLineNo">373</span>     * @param input    The &lt;code&gt;InputStream&lt;/code&gt; to serve as a data source.<a name="line.373"></a>
-<span class="sourceLineNo">374</span>     * @param boundary The token used for dividing the stream into<a name="line.374"></a>
-<span class="sourceLineNo">375</span>     *                 &lt;code&gt;encapsulations&lt;/code&gt;.<a name="line.375"></a>
-<span class="sourceLineNo">376</span>     *<a name="line.376"></a>
-<span class="sourceLineNo">377</span>     * @deprecated 1.2.1 Use {@link #MultipartStream(InputStream, byte[], int,<a name="line.377"></a>
-<span class="sourceLineNo">378</span>     *  ProgressNotifier)}.<a name="line.378"></a>
-<span class="sourceLineNo">379</span>     */<a name="line.379"></a>
-<span class="sourceLineNo">380</span>    @Deprecated<a name="line.380"></a>
-<span class="sourceLineNo">381</span>    public MultipartStream(InputStream input,<a name="line.381"></a>
-<span class="sourceLineNo">382</span>            byte[] boundary) {<a name="line.382"></a>
-<span class="sourceLineNo">383</span>        this(input, boundary, DEFAULT_BUFSIZE, null);<a name="line.383"></a>
-<span class="sourceLineNo">384</span>    }<a name="line.384"></a>
-<span class="sourceLineNo">385</span><a name="line.385"></a>
-<span class="sourceLineNo">386</span>    // --------------------------------------------------------- Public methods<a name="line.386"></a>
-<span class="sourceLineNo">387</span><a name="line.387"></a>
-<span class="sourceLineNo">388</span>    /**<a name="line.388"></a>
-<span class="sourceLineNo">389</span>     * Retrieves the character encoding used when reading the headers of an<a name="line.389"></a>
-<span class="sourceLineNo">390</span>     * individual part. When not specified, or &lt;code&gt;null&lt;/code&gt;, the platform<a name="line.390"></a>
-<span class="sourceLineNo">391</span>     * default encoding is used.<a name="line.391"></a>
-<span class="sourceLineNo">392</span>     *<a name="line.392"></a>
-<span class="sourceLineNo">393</span>     * @return The encoding used to read part headers.<a name="line.393"></a>
-<span class="sourceLineNo">394</span>     */<a name="line.394"></a>
-<span class="sourceLineNo">395</span>    public String getHeaderEncoding() {<a name="line.395"></a>
-<span class="sourceLineNo">396</span>        return headerEncoding;<a name="line.396"></a>
-<span class="sourceLineNo">397</span>    }<a name="line.397"></a>
-<span class="sourceLineNo">398</span><a name="line.398"></a>
-<span class="sourceLineNo">399</span>    /**<a name="line.399"></a>
-<span class="sourceLineNo">400</span>     * Specifies the character encoding to be used when reading the headers of<a name="line.400"></a>
-<span class="sourceLineNo">401</span>     * individual parts. When not specified, or &lt;code&gt;null&lt;/code&gt;, the platform<a name="line.401"></a>
-<span class="sourceLineNo">402</span>     * default encoding is used.<a name="line.402"></a>
-<span class="sourceLineNo">403</span>     *<a name="line.403"></a>
-<span class="sourceLineNo">404</span>     * @param encoding The encoding used to read part headers.<a name="line.404"></a>
-<span class="sourceLineNo">405</span>     */<a name="line.405"></a>
-<span class="sourceLineNo">406</span>    public void setHeaderEncoding(String encoding) {<a name="line.406"></a>
-<span class="sourceLineNo">407</span>        headerEncoding = encoding;<a name="line.407"></a>
-<span class="sourceLineNo">408</span>    }<a name="line.408"></a>
-<span class="sourceLineNo">409</span><a name="line.409"></a>
-<span class="sourceLineNo">410</span>    /**<a name="line.410"></a>
-<span class="sourceLineNo">411</span>     * Reads a byte from the &lt;code&gt;buffer&lt;/code&gt;, and refills it as<a name="line.411"></a>
-<span class="sourceLineNo">412</span>     * necessary.<a name="line.412"></a>
-<span class="sourceLineNo">413</span>     *<a name="line.413"></a>
-<span class="sourceLineNo">414</span>     * @return The next byte from the input stream.<a name="line.414"></a>
-<span class="sourceLineNo">415</span>     *<a name="line.415"></a>
-<span class="sourceLineNo">416</span>     * @throws IOException if there is no more data available.<a name="line.416"></a>
-<span class="sourceLineNo">417</span>     */<a name="line.417"></a>
-<span class="sourceLineNo">418</span>    public byte readByte() throws IOException {<a name="line.418"></a>
-<span class="sourceLineNo">419</span>        // Buffer depleted ?<a name="line.419"></a>
-<span class="sourceLineNo">420</span>        if (head == tail) {<a name="line.420"></a>
-<span class="sourceLineNo">421</span>            head = 0;<a name="line.421"></a>
-<span class="sourceLineNo">422</span>            // Refill.<a name="line.422"></a>
-<span class="sourceLineNo">423</span>            tail = input.read(buffer, head, bufSize);<a name="line.423"></a>
-<span class="sourceLineNo">424</span>            if (tail == -1) {<a name="line.424"></a>
-<span class="sourceLineNo">425</span>                // No more data available.<a name="line.425"></a>
-<span class="sourceLineNo">426</span>                throw new IOException("No more data is available");<a name="line.426"></a>
-<span class="sourceLineNo">427</span>            }<a name="line.427"></a>
-<span class="sourceLineNo">428</span>            if (notifier != null) {<a name="line.428"></a>
-<span class="sourceLineNo">429</span>                notifier.noteBytesRead(tail);<a name="line.429"></a>
-<span class="sourceLineNo">430</span>            }<a name="line.430"></a>
-<span class="sourceLineNo">431</span>        }<a name="line.431"></a>
-<span class="sourceLineNo">432</span>        return buffer[head++];<a name="line.432"></a>
-<span class="sourceLineNo">433</span>    }<a name="line.433"></a>
-<span class="sourceLineNo">434</span><a name="line.434"></a>
-<span class="sourceLineNo">435</span>    /**<a name="line.435"></a>
-<span class="sourceLineNo">436</span>     * Skips a &lt;code&gt;boundary&lt;/code&gt; token, and checks whether more<a name="line.436"></a>
-<span class="sourceLineNo">437</span>     * &lt;code&gt;encapsulations&lt;/code&gt; are contained in the stream.<a name="line.437"></a>
-<span class="sourceLineNo">438</span>     *<a name="line.438"></a>
-<span class="sourceLineNo">439</span>     * @return &lt;code&gt;true&lt;/code&gt; if there are more encapsulations in<a name="line.439"></a>
-<span class="sourceLineNo">440</span>     *         this stream; &lt;code&gt;false&lt;/code&gt; otherwise.<a name="line.440"></a>
-<span class="sourceLineNo">441</span>     *<a name="line.441"></a>
-<span class="sourceLineNo">442</span>     * @throws FileUploadIOException if the bytes read from the stream exceeded the size limits<a name="line.442"></a>
-<span class="sourceLineNo">443</span>     * @throws MalformedStreamException if the stream ends unexpectedly or<a name="line.443"></a>
-<span class="sourceLineNo">444</span>     *                                  fails to follow required syntax.<a name="line.444"></a>
-<span class="sourceLineNo">445</span>     */<a name="line.445"></a>
-<span class="sourceLineNo">446</span>    public boolean readBoundary()<a name="line.446"></a>
-<span class="sourceLineNo">447</span>            throws FileUploadIOException, MalformedStreamException {<a name="line.447"></a>
-<span class="sourceLineNo">448</span>        byte[] marker = new byte[2];<a name="line.448"></a>
-<span class="sourceLineNo">449</span>        boolean nextChunk = false;<a name="line.449"></a>
-<span class="sourceLineNo">450</span><a name="line.450"></a>
-<span class="sourceLineNo">451</span>        head += boundaryLength;<a name="line.451"></a>
-<span class="sourceLineNo">452</span>        try {<a name="line.452"></a>
-<span class="sourceLineNo">453</span>            marker[0] = readByte();<a name="line.453"></a>
-<span class="sourceLineNo">454</span>            if (marker[0] == LF) {<a name="line.454"></a>
-<span class="sourceLineNo">455</span>                // Work around IE5 Mac bug with input type=image.<a name="line.455"></a>
-<span class="sourceLineNo">456</span>                // Because the boundary delimiter, not including the trailing<a name="line.456"></a>
-<span class="sourceLineNo">457</span>                // CRLF, must not appear within any file (RFC 2046, section<a name="line.457"></a>
-<span class="sourceLineNo">458</span>                // 5.1.1), we know the missing CR is due to a buggy browser<a name="line.458"></a>
-<span class="sourceLineNo">459</span>                // rather than a file containing something similar to a<a name="line.459"></a>
-<span class="sourceLineNo">460</span>                // boundary.<a name="line.460"></a>
-<span class="sourceLineNo">461</span>                return true;<a name="line.461"></a>
-<span class="sourceLineNo">462</span>            }<a name="line.462"></a>
-<span class="sourceLineNo">463</span><a name="line.463"></a>
-<span class="sourceLineNo">464</span>            marker[1] = readByte();<a name="line.464"></a>
-<span class="sourceLineNo">465</span>            if (arrayequals(marker, STREAM_TERMINATOR, 2)) {<a name="line.465"></a>
-<span class="sourceLineNo">466</span>                nextChunk = false;<a name="line.466"></a>
-<span class="sourceLineNo">467</span>            } else if (arrayequals(marker, FIELD_SEPARATOR, 2)) {<a name="line.467"></a>
-<span class="sourceLineNo">468</span>                nextChunk = true;<a name="line.468"></a>
-<span class="sourceLineNo">469</span>            } else {<a name="line.469"></a>
-<span class="sourceLineNo">470</span>                throw new MalformedStreamException(<a name="line.470"></a>
-<span class="sourceLineNo">471</span>                "Unexpected characters follow a boundary");<a name="line.471"></a>
-<span class="sourceLineNo">472</span>            }<a name="line.472"></a>
-<span class="sourceLineNo">473</span>        } catch (FileUploadIOException e) {<a name="line.473"></a>
-<span class="sourceLineNo">474</span>            // wraps a SizeException, re-throw as it will be unwrapped later<a name="line.474"></a>
-<span class="sourceLineNo">475</span>            throw e;<a name="line.475"></a>
-<span class="sourceLineNo">476</span>        } catch (IOException e) {<a name="line.476"></a>
-<span class="sourceLineNo">477</span>            throw new MalformedStreamException("Stream ended unexpectedly");<a name="line.477"></a>
-<span class="sourceLineNo">478</span>        }<a name="line.478"></a>
-<span class="sourceLineNo">479</span>        return nextChunk;<a name="line.479"></a>
-<span class="sourceLineNo">480</span>    }<a name="line.480"></a>
-<span class="sourceLineNo">481</span><a name="line.481"></a>
-<span class="sourceLineNo">482</span>    /**<a name="line.482"></a>
-<span class="sourceLineNo">483</span>     * &lt;p&gt;Changes the boundary token used for partitioning the stream.<a name="line.483"></a>
-<span class="sourceLineNo">484</span>     *<a name="line.484"></a>
-<span class="sourceLineNo">485</span>     * &lt;p&gt;This method allows single pass processing of nested multipart<a name="line.485"></a>
-<span class="sourceLineNo">486</span>     * streams.<a name="line.486"></a>
-<span class="sourceLineNo">487</span>     *<a name="line.487"></a>
-<span class="sourceLineNo">488</span>     * &lt;p&gt;The boundary token of the nested stream is &lt;code&gt;required&lt;/code&gt;<a name="line.488"></a>
-<span class="sourceLineNo">489</span>     * to be of the same length as the boundary token in parent stream.<a name="line.489"></a>
-<span class="sourceLineNo">490</span>     *<a name="line.490"></a>
-<span class="sourceLineNo">491</span>     * &lt;p&gt;Restoring the parent stream boundary token after processing of a<a name="line.491"></a>
-<span class="sourceLineNo">492</span>     * nested stream is left to the application.<a name="line.492"></a>
-<span class="sourceLineNo">493</span>     *<a name="line.493"></a>
-<span class="sourceLineNo">494</span>     * @param boundary The boundary to be used for parsing of the nested<a name="line.494"></a>
-<span class="sourceLineNo">495</span>     *                 stream.<a name="line.495"></a>
-<span class="sourceLineNo">496</span>     *<a name="line.496"></a>
-<span class="sourceLineNo">497</span>     * @throws IllegalBoundaryException if the &lt;code&gt;boundary&lt;/code&gt;<a name="line.497"></a>
-<span class="sourceLineNo">498</span>     *                                  has a different length than the one<a name="line.498"></a>
-<span class="sourceLineNo">499</span>     *                                  being currently parsed.<a name="line.499"></a>
-<span class="sourceLineNo">500</span>     */<a name="line.500"></a>
-<span class="sourceLineNo">501</span>    public void setBoundary(byte[] boundary)<a name="line.501"></a>
-<span class="sourceLineNo">502</span>            throws IllegalBoundaryException {<a name="line.502"></a>
-<span class="sourceLineNo">503</span>        if (boundary.length != boundaryLength - BOUNDARY_PREFIX.length) {<a name="line.503"></a>
-<span class="sourceLineNo">504</span>            throw new IllegalBoundaryException(<a name="line.504"></a>
-<span class="sourceLineNo">505</span>            "The length of a boundary token can not be changed");<a name="line.505"></a>
-<span class="sourceLineNo">506</span>        }<a name="line.506"></a>
-<span class="sourceLineNo">507</span>        System.arraycopy(boundary, 0, this.boundary, BOUNDARY_PREFIX.length,<a name="line.507"></a>
-<span class="sourceLineNo">508</span>                boundary.length);<a name="line.508"></a>
-<span class="sourceLineNo">509</span>    }<a name="line.509"></a>
-<span class="sourceLineNo">510</span><a name="line.510"></a>
-<span class="sourceLineNo">511</span>    /**<a name="line.511"></a>
-<span class="sourceLineNo">512</span>     * &lt;p&gt;Reads the &lt;code&gt;header-part&lt;/code&gt; of the current<a name="line.512"></a>
-<span class="sourceLineNo">513</span>     * &lt;code&gt;encapsulation&lt;/code&gt;.<a name="line.513"></a>
-<span class="sourceLineNo">514</span>     *<a name="line.514"></a>
-<span class="sourceLineNo">515</span>     * &lt;p&gt;Headers are returned verbatim to the input stream, including the<a name="line.515"></a>
-<span class="sourceLineNo">516</span>     * trailing &lt;code&gt;CRLF&lt;/code&gt; marker. Parsing is left to the<a name="line.516"></a>
-<span class="sourceLineNo">517</span>     * application.<a name="line.517"></a>
-<span class="sourceLineNo">518</span>     *<a name="line.518"></a>
-<span class="sourceLineNo">519</span>     * &lt;p&gt;&lt;strong&gt;TODO&lt;/strong&gt; allow limiting maximum header size to<a name="line.519"></a>
-<span class="sourceLineNo">520</span>     * protect against abuse.<a name="line.520"></a>
-<span class="sourceLineNo">521</span>     *<a name="line.521"></a>
-<span class="sourceLineNo">522</span>     * @return The &lt;code&gt;header-part&lt;/code&gt; of the current encapsulation.<a name="line.522"></a>
-<span class="sourceLineNo">523</span>     *<a name="line.523"></a>
-<span class="sourceLineNo">524</span>     * @throws FileUploadIOException if the bytes read from the stream exceeded the size limits.<a name="line.524"></a>
-<span class="sourceLineNo">525</span>     * @throws MalformedStreamException if the stream ends unexpectedly.<a name="line.525"></a>
-<span class="sourceLineNo">526</span>     */<a name="line.526"></a>
-<span class="sourceLineNo">527</span>    public String readHeaders() throws FileUploadIOException, MalformedStreamException {<a name="line.527"></a>
-<span class="sourceLineNo">528</span>        int i = 0;<a name="line.528"></a>
-<span class="sourceLineNo">529</span>        byte b;<a name="line.529"></a>
-<span class="sourceLineNo">530</span>        // to support multi-byte characters<a name="line.530"></a>
-<span class="sourceLineNo">531</span>        ByteArrayOutputStream baos = new ByteArrayOutputStream();<a name="line.531"></a>
-<span class="sourceLineNo">532</span>        int size = 0;<a name="line.532"></a>
-<span class="sourceLineNo">533</span>        while (i &lt; HEADER_SEPARATOR.length) {<a name="line.533"></a>
-<span class="sourceLineNo">534</span>            try {<a name="line.534"></a>
-<span class="sourceLineNo">535</span>                b = readByte();<a name="line.535"></a>
-<span class="sourceLineNo">536</span>            } catch (FileUploadIOException e) {<a name="line.536"></a>
-<span class="sourceLineNo">537</span>                // wraps a SizeException, re-throw as it will be unwrapped later<a name="line.537"></a>
-<span class="sourceLineNo">538</span>                throw e;<a name="line.538"></a>
-<span class="sourceLineNo">539</span>            } catch (IOException e) {<a name="line.539"></a>
-<span class="sourceLineNo">540</span>                throw new MalformedStreamException("Stream ended unexpectedly");<a name="line.540"></a>
-<span class="sourceLineNo">541</span>            }<a name="line.541"></a>
-<span class="sourceLineNo">542</span>            if (++size &gt; HEADER_PART_SIZE_MAX) {<a name="line.542"></a>
-<span class="sourceLineNo">543</span>                throw new MalformedStreamException(<a name="line.543"></a>
-<span class="sourceLineNo">544</span>                        format("Header section has more than %s bytes (maybe it is not properly terminated)",<a name="line.544"></a>
-<span class="sourceLineNo">545</span>                               Integer.valueOf(HEADER_PART_SIZE_MAX)));<a name="line.545"></a>
-<span class="sourceLineNo">546</span>            }<a name="line.546"></a>
-<span class="sourceLineNo">547</span>            if (b == HEADER_SEPARATOR[i]) {<a name="line.547"></a>
-<span class="sourceLineNo">548</span>                i++;<a name="line.548"></a>
-<span class="sourceLineNo">549</span>            } else {<a name="line.549"></a>
-<span class="sourceLineNo">550</span>                i = 0;<a name="line.550"></a>
-<span class="sourceLineNo">551</span>            }<a name="line.551"></a>
-<span class="sourceLineNo">552</span>            baos.write(b);<a name="line.552"></a>
-<span class="sourceLineNo">553</span>        }<a name="line.553"></a>
-<span class="sourceLineNo">554</span><a name="line.554"></a>
-<span class="sourceLineNo">555</span>        String headers = null;<a name="line.555"></a>
-<span class="sourceLineNo">556</span>        if (headerEncoding != null) {<a name="line.556"></a>
-<span class="sourceLineNo">557</span>            try {<a name="line.557"></a>
-<span class="sourceLineNo">558</span>                headers = baos.toString(headerEncoding);<a name="line.558"></a>
-<span class="sourceLineNo">559</span>            } catch (UnsupportedEncodingException e) {<a name="line.559"></a>
-<span class="sourceLineNo">560</span>                // Fall back to platform default if specified encoding is not<a name="line.560"></a>
-<span class="sourceLineNo">561</span>                // supported.<a name="line.561"></a>
-<span class="sourceLineNo">562</span>                headers = baos.toString();<a name="line.562"></a>
-<span class="sourceLineNo">563</span>            }<a name="line.563"></a>
-<span class="sourceLineNo">564</span>        } else {<a name="line.564"></a>
-<span class="sourceLineNo">565</span>            headers = baos.toString();<a name="line.565"></a>
-<span class="sourceLineNo">566</span>        }<a name="line.566"></a>
-<span class="sourceLineNo">567</span><a name="line.567"></a>
-<span class="sourceLineNo">568</span>        return headers;<a name="line.568"></a>
-<span class="sourceLineNo">569</span>    }<a name="line.569"></a>
-<span class="sourceLineNo">570</span><a name="line.570"></a>
-<span class="sourceLineNo">571</span>    /**<a name="line.571"></a>
-<span class="sourceLineNo">572</span>     * &lt;p&gt;Reads &lt;code&gt;body-data&lt;/code&gt; from the current<a name="line.572"></a>
-<span class="sourceLineNo">573</span>     * &lt;code&gt;encapsulation&lt;/code&gt; and writes its contents into the<a name="line.573"></a>
-<span class="sourceLineNo">574</span>     * output &lt;code&gt;Stream&lt;/code&gt;.<a name="line.574"></a>
-<span class="sourceLineNo">575</span>     *<a name="line.575"></a>
-<span class="sourceLineNo">576</span>     * &lt;p&gt;Arbitrary large amounts of data can be processed by this<a name="line.576"></a>
-<span class="sourceLineNo">577</span>     * method using a constant size buffer. (see {@link<a name="line.577"></a>
-<span class="sourceLineNo">578</span>     * #MultipartStream(InputStream,byte[],int,<a name="line.578"></a>
-<span class="sourceLineNo">579</span>     *   MultipartStream.ProgressNotifier) constructor}).<a name="line.579"></a>
-<span class="sourceLineNo">580</span>     *<a name="line.580"></a>
-<span class="sourceLineNo">581</span>     * @param output The &lt;code&gt;Stream&lt;/code&gt; to write data into. May<a name="line.581"></a>
-<span class="sourceLineNo">582</span>     *               be null, in which case this method is equivalent<a name="line.582"></a>
-<span class="sourceLineNo">583</span>     *               to {@link #discardBodyData()}.<a name="line.583"></a>
-<span class="sourceLineNo">584</span>     *<a name="line.584"></a>
-<span class="sourceLineNo">585</span>     * @return the amount of data written.<a name="line.585"></a>
-<span class="sourceLineNo">586</span>     *<a name="line.586"></a>
-<span class="sourceLineNo">587</span>     * @throws MalformedStreamException if the stream ends unexpectedly.<a name="line.587"></a>
-<span class="sourceLineNo">588</span>     * @throws IOException              if an i/o error occurs.<a name="line.588"></a>
-<span class="sourceLineNo">589</span>     */<a name="line.589"></a>
-<span class="sourceLineNo">590</span>    public int readBodyData(OutputStream output)<a name="line.590"></a>
-<span class="sourceLineNo">591</span>            throws MalformedStreamException, IOException {<a name="line.591"></a>
-<span class="sourceLineNo">592</span>        return (int) Streams.copy(newInputStream(), output, false); // N.B. Streams.copy closes the input stream<a name="line.592"></a>
-<span class="sourceLineNo">593</span>    }<a name="line.593"></a>
-<span class="sourceLineNo">594</span><a name="line.594"></a>
-<span class="sourceLineNo">595</span>    /**<a name="line.595"></a>
-<span class="sourceLineNo">596</span>     * Creates a new {@link ItemInputStream}.<a name="line.596"></a>
-<span class="sourceLineNo">597</span>     * @return A new instance of {@link ItemInputStream}.<a name="line.597"></a>
-<span class="sourceLineNo">598</span>     */<a name="line.598"></a>
-<span class="sourceLineNo">599</span>    ItemInputStream newInputStream() {<a name="line.599"></a>
-<span class="sourceLineNo">600</span>        return new ItemInputStream();<a name="line.600"></a>
+<span class="sourceLineNo">341</span>        this.input = input;<a name="line.341"></a>
+<span class="sourceLineNo">342</span>        this.bufSize = Math.max(bufSize, boundaryLength*2);<a name="line.342"></a>
+<span class="sourceLineNo">343</span>        this.buffer = new byte[this.bufSize];<a name="line.343"></a>
+<span class="sourceLineNo">344</span>        this.notifier = pNotifier;<a name="line.344"></a>
+<span class="sourceLineNo">345</span><a name="line.345"></a>
+<span class="sourceLineNo">346</span>        this.boundary = new byte[this.boundaryLength];<a name="line.346"></a>
+<span class="sourceLineNo">347</span>        this.boundaryTable = new int[this.boundaryLength + 1];<a name="line.347"></a>
+<span class="sourceLineNo">348</span>        this.keepRegion = this.boundary.length;<a name="line.348"></a>
+<span class="sourceLineNo">349</span><a name="line.349"></a>
+<span class="sourceLineNo">350</span>        System.arraycopy(BOUNDARY_PREFIX, 0, this.boundary, 0,<a name="line.350"></a>
+<span class="sourceLineNo">351</span>                BOUNDARY_PREFIX.length);<a name="line.351"></a>
+<span class="sourceLineNo">352</span>        System.arraycopy(boundary, 0, this.boundary, BOUNDARY_PREFIX.length,<a name="line.352"></a>
+<span class="sourceLineNo">353</span>                boundary.length);<a name="line.353"></a>
+<span class="sourceLineNo">354</span>        computeBoundaryTable();<a name="line.354"></a>
+<span class="sourceLineNo">355</span><a name="line.355"></a>
+<span class="sourceLineNo">356</span>        head = 0;<a name="line.356"></a>
+<span class="sourceLineNo">357</span>        tail = 0;<a name="line.357"></a>
+<span class="sourceLineNo">358</span>    }<a name="line.358"></a>
+<span class="sourceLineNo">359</span><a name="line.359"></a>
+<span class="sourceLineNo">360</span>    /**<a name="line.360"></a>
+<span class="sourceLineNo">361</span>     * &lt;p&gt; Constructs a &lt;code&gt;MultipartStream&lt;/code&gt; with a default size buffer.<a name="line.361"></a>
+<span class="sourceLineNo">362</span>     *<a name="line.362"></a>
+<span class="sourceLineNo">363</span>     * @param input    The &lt;code&gt;InputStream&lt;/code&gt; to serve as a data source.<a name="line.363"></a>
+<span class="sourceLineNo">364</span>     * @param boundary The token used for dividing the stream into<a name="line.364"></a>
+<span class="sourceLineNo">365</span>     *                 &lt;code&gt;encapsulations&lt;/code&gt;.<a name="line.365"></a>
+<span class="sourceLineNo">366</span>     * @param pNotifier An object for calling the progress listener, if any.<a name="line.366"></a>
+<span class="sourceLineNo">367</span>     *<a name="line.367"></a>
+<span class="sourceLineNo">368</span>     *<a name="line.368"></a>
+<span class="sourceLineNo">369</span>     * @see #MultipartStream(InputStream, byte[], int, ProgressNotifier)<a name="line.369"></a>
+<span class="sourceLineNo">370</span>     */<a name="line.370"></a>
+<span class="sourceLineNo">371</span>    MultipartStream(InputStream input,<a name="line.371"></a>
+<span class="sourceLineNo">372</span>            byte[] boundary,<a name="line.372"></a>
+<span class="sourceLineNo">373</span>            ProgressNotifier pNotifier) {<a name="line.373"></a>
+<span class="sourceLineNo">374</span>        this(input, boundary, DEFAULT_BUFSIZE, pNotifier);<a name="line.374"></a>
+<span class="sourceLineNo">375</span>    }<a name="line.375"></a>
+<span class="sourceLineNo">376</span><a name="line.376"></a>
+<span class="sourceLineNo">377</span>    /**<a name="line.377"></a>
+<span class="sourceLineNo">378</span>     * &lt;p&gt; Constructs a &lt;code&gt;MultipartStream&lt;/code&gt; with a default size buffer.<a name="line.378"></a>
+<span class="sourceLineNo">379</span>     *<a name="line.379"></a>
+<span class="sourceLineNo">380</span>     * @param input    The &lt;code&gt;InputStream&lt;/code&gt; to serve as a data source.<a name="line.380"></a>
+<span class="sourceLineNo">381</span>     * @param boundary The token used for dividing the stream into<a name="line.381"></a>
+<span class="sourceLineNo">382</span>     *                 &lt;code&gt;encapsulations&lt;/code&gt;.<a name="line.382"></a>
+<span class="sourceLineNo">383</span>     *<a name="line.383"></a>
+<span class="sourceLineNo">384</span>     * @deprecated 1.2.1 Use {@link #MultipartStream(InputStream, byte[], int,<a name="line.384"></a>
+<span class="sourceLineNo">385</span>     *  ProgressNotifier)}.<a name="line.385"></a>
+<span class="sourceLineNo">386</span>     */<a name="line.386"></a>
+<span class="sourceLineNo">387</span>    @Deprecated<a name="line.387"></a>
+<span class="sourceLineNo">388</span>    public MultipartStream(InputStream input,<a name="line.388"></a>
+<span class="sourceLineNo">389</span>            byte[] boundary) {<a name="line.389"></a>
+<span class="sourceLineNo">390</span>        this(input, boundary, DEFAULT_BUFSIZE, null);<a name="line.390"></a>
+<span class="sourceLineNo">391</span>    }<a name="line.391"></a>
+<span class="sourceLineNo">392</span><a name="line.392"></a>
+<span class="sourceLineNo">393</span>    // --------------------------------------------------------- Public methods<a name="line.393"></a>
+<span class="sourceLineNo">394</span><a name="line.394"></a>
+<span class="sourceLineNo">395</span>    /**<a name="line.395"></a>
+<span class="sourceLineNo">396</span>     * Retrieves the character encoding used when reading the headers of an<a name="line.396"></a>
+<span class="sourceLineNo">397</span>     * individual part. When not specified, or &lt;code&gt;null&lt;/code&gt;, the platform<a name="line.397"></a>
+<span class="sourceLineNo">398</span>     * default encoding is used.<a name="line.398"></a>
+<span class="sourceLineNo">399</span>     *<a name="line.399"></a>
+<span class="sourceLineNo">400</span>     * @return The encoding used to read part headers.<a name="line.400"></a>
+<span class="sourceLineNo">401</span>     */<a name="line.401"></a>
+<span class="sourceLineNo">402</span>    public String getHeaderEncoding() {<a name="line.402"></a>
+<span class="sourceLineNo">403</span>        return headerEncoding;<a name="line.403"></a>
+<span class="sourceLineNo">404</span>    }<a name="line.404"></a>
+<span class="sourceLineNo">405</span><a name="line.405"></a>
+<span class="sourceLineNo">406</span>    /**<a name="line.406"></a>
+<span class="sourceLineNo">407</span>     * Specifies the character encoding to be used when reading the headers of<a name="line.407"></a>
+<span class="sourceLineNo">408</span>     * individual parts. When not specified, or &lt;code&gt;null&lt;/code&gt;, the platform<a name="line.408"></a>
+<span class="sourceLineNo">409</span>     * default encoding is used.<a name="line.409"></a>
+<span class="sourceLineNo">410</span>     *<a name="line.410"></a>
+<span class="sourceLineNo">411</span>     * @param encoding The encoding used to read part headers.<a name="line.411"></a>
+<span class="sourceLineNo">412</span>     */<a name="line.412"></a>
+<span class="sourceLineNo">413</span>    public void setHeaderEncoding(String encoding) {<a name="line.413"></a>
+<span class="sourceLineNo">414</span>        headerEncoding = encoding;<a name="line.414"></a>
+<span class="sourceLineNo">415</span>    }<a name="line.415"></a>
+<span class="sourceLineNo">416</span><a name="line.416"></a>
+<span class="sourceLineNo">417</span>    /**<a name="line.417"></a>
+<span class="sourceLineNo">418</span>     * Reads a byte from the &lt;code&gt;buffer&lt;/code&gt;, and refills it as<a name="line.418"></a>
+<span class="sourceLineNo">419</span>     * necessary.<a name="line.419"></a>
+<span class="sourceLineNo">420</span>     *<a name="line.420"></a>
+<span class="sourceLineNo">421</span>     * @return The next byte from the input stream.<a name="line.421"></a>
+<span class="sourceLineNo">422</span>     *<a name="line.422"></a>
+<span class="sourceLineNo">423</span>     * @throws IOException if there is no more data available.<a name="line.423"></a>
+<span class="sourceLineNo">424</span>     */<a name="line.424"></a>
+<span class="sourceLineNo">425</span>    public byte readByte() throws IOException {<a name="line.425"></a>
+<span class="sourceLineNo">426</span>        // Buffer depleted ?<a name="line.426"></a>
+<span class="sourceLineNo">427</span>        if (head == tail) {<a name="line.427"></a>
+<span class="sourceLineNo">428</span>            head = 0;<a name="line.428"></a>
+<span class="sourceLineNo">429</span>            // Refill.<a name="line.429"></a>
+<span class="sourceLineNo">430</span>            tail = input.read(buffer, head, bufSize);<a name="line.430"></a>
+<span class="sourceLineNo">431</span>            if (tail == -1) {<a name="line.431"></a>
+<span class="sourceLineNo">432</span>                // No more data available.<a name="line.432"></a>
+<span class="sourceLineNo">433</span>                throw new IOException("No more data is available");<a name="line.433"></a>
+<span class="sourceLineNo">434</span>            }<a name="line.434"></a>
+<span class="sourceLineNo">435</span>            if (notifier != null) {<a name="line.435"></a>
+<span class="sourceLineNo">436</span>                notifier.noteBytesRead(tail);<a name="line.436"></a>
+<span class="sourceLineNo">437</span>            }<a name="line.437"></a>
+<span class="sourceLineNo">438</span>        }<a name="line.438"></a>
+<span class="sourceLineNo">439</span>        return buffer[head++];<a name="line.439"></a>
+<span class="sourceLineNo">440</span>    }<a name="line.440"></a>
+<span class="sourceLineNo">441</span><a name="line.441"></a>
+<span class="sourceLineNo">442</span>    /**<a name="line.442"></a>
+<span class="sourceLineNo">443</span>     * Skips a &lt;code&gt;boundary&lt;/code&gt; token, and checks whether more<a name="line.443"></a>
+<span class="sourceLineNo">444</span>     * &lt;code&gt;encapsulations&lt;/code&gt; are contained in the stream.<a name="line.444"></a>
+<span class="sourceLineNo">445</span>     *<a name="line.445"></a>
+<span class="sourceLineNo">446</span>     * @return &lt;code&gt;true&lt;/code&gt; if there are more encapsulations in<a name="line.446"></a>
+<span class="sourceLineNo">447</span>     *         this stream; &lt;code&gt;false&lt;/code&gt; otherwise.<a name="line.447"></a>
+<span class="sourceLineNo">448</span>     *<a name="line.448"></a>
+<span class="sourceLineNo">449</span>     * @throws FileUploadIOException if the bytes read from the stream exceeded the size limits<a name="line.449"></a>
+<span class="sourceLineNo">450</span>     * @throws MalformedStreamException if the stream ends unexpectedly or<a name="line.450"></a>
+<span class="sourceLineNo">451</span>     *                                  fails to follow required syntax.<a name="line.451"></a>
+<span class="sourceLineNo">452</span>     */<a name="line.452"></a>
+<span class="sourceLineNo">453</span>    public boolean readBoundary()<a name="line.453"></a>
+<span class="sourceLineNo">454</span>            throws FileUploadIOException, MalformedStreamException {<a name="line.454"></a>
+<span class="sourceLineNo">455</span>        byte[] marker = new byte[2];<a name="line.455"></a>
+<span class="sourceLineNo">456</span>        boolean nextChunk = false;<a name="line.456"></a>
+<span class="sourceLineNo">457</span><a name="line.457"></a>
+<span class="sourceLineNo">458</span>        head += boundaryLength;<a name="line.458"></a>
+<span class="sourceLineNo">459</span>        try {<a name="line.459"></a>
+<span class="sourceLineNo">460</span>            marker[0] = readByte();<a name="line.460"></a>
+<span class="sourceLineNo">461</span>            if (marker[0] == LF) {<a name="line.461"></a>
+<span class="sourceLineNo">462</span>                // Work around IE5 Mac bug with input type=image.<a name="line.462"></a>
+<span class="sourceLineNo">463</span>                // Because the boundary delimiter, not including the trailing<a name="line.463"></a>
+<span class="sourceLineNo">464</span>                // CRLF, must not appear within any file (RFC 2046, section<a name="line.464"></a>
+<span class="sourceLineNo">465</span>                // 5.1.1), we know the missing CR is due to a buggy browser<a name="line.465"></a>
+<span class="sourceLineNo">466</span>                // rather than a file containing something similar to a<a name="line.466"></a>
+<span class="sourceLineNo">467</span>                // boundary.<a name="line.467"></a>
+<span class="sourceLineNo">468</span>                return true;<a name="line.468"></a>
+<span class="sourceLineNo">469</span>            }<a name="line.469"></a>
+<span class="sourceLineNo">470</span><a name="line.470"></a>
+<span class="sourceLineNo">471</span>            marker[1] = readByte();<a name="line.471"></a>
+<span class="sourceLineNo">472</span>            if (arrayequals(marker, STREAM_TERMINATOR, 2)) {<a name="line.472"></a>
+<span class="sourceLineNo">473</span>                nextChunk = false;<a name="line.473"></a>
+<span class="sourceLineNo">474</span>            } else if (arrayequals(marker, FIELD_SEPARATOR, 2)) {<a name="line.474"></a>
+<span class="sourceLineNo">475</span>                nextChunk = true;<a name="line.475"></a>
+<span class="sourceLineNo">476</span>            } else {<a name="line.476"></a>
+<span class="sourceLineNo">477</span>                throw new MalformedStreamException(<a name="line.477"></a>
+<span class="sourceLineNo">478</span>                "Unexpected characters follow a boundary");<a name="line.478"></a>
+<span class="sourceLineNo">479</span>            }<a name="line.479"></a>
+<span class="sourceLineNo">480</span>        } catch (FileUploadIOException e) {<a name="line.480"></a>
+<span class="sourceLineNo">481</span>            // wraps a SizeException, re-throw as it will be unwrapped later<a name="line.481"></a>
+<span class="sourceLineNo">482</span>            throw e;<a name="line.482"></a>
+<span class="sourceLineNo">483</span>        } catch (IOException e) {<a name="line.483"></a>
+<span class="sourceLineNo">484</span>            throw new MalformedStreamException("Stream ended unexpectedly");<a name="line.484"></a>
+<span class="sourceLineNo">485</span>        }<a name="line.485"></a>
+<span class="sourceLineNo">486</span>        return nextChunk;<a name="line.486"></a>
+<span class="sourceLineNo">487</span>    }<a name="line.487"></a>
+<span class="sourceLineNo">488</span><a name="line.488"></a>
+<span class="sourceLineNo">489</span>    /**<a name="line.489"></a>
+<span class="sourceLineNo">490</span>     * &lt;p&gt;Changes the boundary token used for partitioning the stream.<a name="line.490"></a>
+<span class="sourceLineNo">491</span>     *<a name="line.491"></a>
+<span class="sourceLineNo">492</span>     * &lt;p&gt;This method allows single pass processing of nested multipart<a name="line.492"></a>
+<span class="sourceLineNo">493</span>     * streams.<a name="line.493"></a>
+<span class="sourceLineNo">494</span>     *<a name="line.494"></a>
+<span class="sourceLineNo">495</span>     * &lt;p&gt;The boundary token of the nested stream is &lt;code&gt;required&lt;/code&gt;<a name="line.495"></a>
+<span class="sourceLineNo">496</span>     * to be of the same length as the boundary token in parent stream.<a name="line.496"></a>
+<span class="sourceLineNo">497</span>     *<a name="line.497"></a>
+<span class="sourceLineNo">498</span>     * &lt;p&gt;Restoring the parent stream boundary token after processing of a<a name="line.498"></a>
+<span class="sourceLineNo">499</span>     * nested stream is left to the application.<a name="line.499"></a>
+<span class="sourceLineNo">500</span>     *<a name="line.500"></a>
+<span class="sourceLineNo">501</span>     * @param boundary The boundary to be used for parsing of the nested<a name="line.501"></a>
+<span class="sourceLineNo">502</span>     *                 stream.<a name="line.502"></a>
+<span class="sourceLineNo">503</span>     *<a name="line.503"></a>
+<span class="sourceLineNo">504</span>     * @throws IllegalBoundaryException if the &lt;code&gt;boundary&lt;/code&gt;<a name="line.504"></a>
+<span class="sourceLineNo">505</span>     *                                  has a different length than the one<a name="line.505"></a>
+<span class="sourceLineNo">506</span>     *                                  being currently parsed.<a name="line.506"></a>
+<span class="sourceLineNo">507</span>     */<a name="line.507"></a>
+<span class="sourceLineNo">508</span>    public void setBoundary(byte[] boundary)<a name="line.508"></a>
+<span class="sourceLineNo">509</span>            throws IllegalBoundaryException {<a name="line.509"></a>
+<span class="sourceLineNo">510</span>        if (boundary.length != boundaryLength - BOUNDARY_PREFIX.length) {<a name="line.510"></a>
+<span class="sourceLineNo">511</span>            throw new IllegalBoundaryException(<a name="line.511"></a>
+<span class="sourceLineNo">512</span>            "The length of a boundary token can not be changed");<a name="line.512"></a>
+<span class="sourceLineNo">513</span>        }<a name="line.513"></a>
+<span class="sourceLineNo">514</span>        System.arraycopy(boundary, 0, this.boundary, BOUNDARY_PREFIX.length,<a name="line.514"></a>
+<span class="sourceLineNo">515</span>                boundary.length);<a name="line.515"></a>
+<span class="sourceLineNo">516</span>        computeBoundaryTable();<a name="line.516"></a>
+<span class="sourceLineNo">517</span>    }<a name="line.517"></a>
+<span class="sourceLineNo">518</span><a name="line.518"></a>
+<span class="sourceLineNo">519</span>    /**<a name="line.519"></a>
+<span class="sourceLineNo">520</span>     * Compute the table used for Knuth-Morris-Pratt search algorithm.<a name="line.520"></a>
+<span class="sourceLineNo">521</span>     */<a name="line.521"></a>
+<span class="sourceLineNo">522</span>    private void computeBoundaryTable() {<a name="line.522"></a>
+<span class="sourceLineNo">523</span>        int position = 2;<a name="line.523"></a>
+<span class="sourceLineNo">524</span>        int candidate = 0;<a name="line.524"></a>
+<span class="sourceLineNo">525</span><a name="line.525"></a>
+<span class="sourceLineNo">526</span>        boundaryTable[0] = -1;<a name="line.526"></a>
+<span class="sourceLineNo">527</span>        boundaryTable[1] = 0;<a name="line.527"></a>
+<span class="sourceLineNo">528</span><a name="line.528"></a>
+<span class="sourceLineNo">529</span>        while (position &lt;= boundaryLength) {<a name="line.529"></a>
+<span class="sourceLineNo">530</span>            if (boundary[position - 1] == boundary[candidate]) {<a name="line.530"></a>
+<span class="sourceLineNo">531</span>                boundaryTable[position] = candidate + 1;<a name="line.531"></a>
+<span class="sourceLineNo">532</span>                candidate++;<a name="line.532"></a>
+<span class="sourceLineNo">533</span>                position++;<a name="line.533"></a>
+<span class="sourceLineNo">534</span>            } else if (candidate &gt; 0) {<a name="line.534"></a>
+<span class="sourceLineNo">535</span>                candidate = boundaryTable[candidate];<a name="line.535"></a>
+<span class="sourceLineNo">536</span>            } else {<a name="line.536"></a>
+<span class="sourceLineNo">537</span>                boundaryTable[position] = 0;<a name="line.537"></a>
+<span class="sourceLineNo">538</span>                position++;<a name="line.538"></a>
+<span class="sourceLineNo">539</span>            }<a name="line.539"></a>
+<span class="sourceLineNo">540</span>        }<a name="line.540"></a>
+<span class="sourceLineNo">541</span>    }<a name="line.541"></a>
+<span class="sourceLineNo">542</span><a name="line.542"></a>
+<span class="sourceLineNo">543</span>    /**<a name="line.543"></a>
+<span class="sourceLineNo">544</span>     * &lt;p&gt;Reads the &lt;code&gt;header-part&lt;/code&gt; of the current<a name="line.544"></a>
+<span class="sourceLineNo">545</span>     * &lt;code&gt;encapsulation&lt;/code&gt;.<a name="line.545"></a>
+<span class="sourceLineNo">546</span>     *<a name="line.546"></a>
+<span class="sourceLineNo">547</span>     * &lt;p&gt;Headers are returned verbatim to the input stream, including the<a name="line.547"></a>
+<span class="sourceLineNo">548</span>     * trailing &lt;code&gt;CRLF&lt;/code&gt; marker. Parsing is left to the<a name="line.548"></a>
+<span class="sourceLineNo">549</span>     * application.<a name="line.549"></a>
+<span class="sourceLineNo">550</span>     *<a name="line.550"></a>
+<span class="sourceLineNo">551</span>     * &lt;p&gt;&lt;strong&gt;TODO&lt;/strong&gt; allow limiting maximum header size to<a name="line.551"></a>
+<span class="sourceLineNo">552</span>     * protect against abuse.<a name="line.552"></a>
+<span class="sourceLineNo">553</span>     *<a name="line.553"></a>
+<span class="sourceLineNo">554</span>     * @return The &lt;code&gt;header-part&lt;/code&gt; of the current encapsulation.<a name="line.554"></a>
+<span class="sourceLineNo">555</span>     *<a name="line.555"></a>
+<span class="sourceLineNo">556</span>     * @throws FileUploadIOException if the bytes read from the stream exceeded the size limits.<a name="line.556"></a>
+<span class="sourceLineNo">557</span>     * @throws MalformedStreamException if the stream ends unexpectedly.<a name="line.557"></a>
+<span class="sourceLineNo">558</span>     */<a name="line.558"></a>
+<span class="sourceLineNo">559</span>    public String readHeaders() throws FileUploadIOException, MalformedStreamException {<a name="line.559"></a>
+<span class="sourceLineNo">560</span>        int i = 0;<a name="line.560"></a>
+<span class="sourceLineNo">561</span>        byte b;<a name="line.561"></a>
+<span class="sourceLineNo">562</span>        // to support multi-byte characters<a name="line.562"></a>
+<span class="sourceLineNo">563</span>        ByteArrayOutputStream baos = new ByteArrayOutputStream();<a name="line.563"></a>
+<span class="sourceLineNo">564</span>        int size = 0;<a name="line.564"></a>
+<span class="sourceLineNo">565</span>        while (i &lt; HEADER_SEPARATOR.length) {<a name="line.565"></a>
+<span class="sourceLineNo">566</span>            try {<a name="line.566"></a>
+<span class="sourceLineNo">567</span>                b = readByte();<a name="line.567"></a>
+<span class="sourceLineNo">568</span>            } catch (FileUploadIOException e) {<a name="line.568"></a>
+<span class="sourceLineNo">569</span>                // wraps a SizeException, re-throw as it will be unwrapped later<a name="line.569"></a>
+<span class="sourceLineNo">570</span>                throw e;<a name="line.570"></a>
+<span class="sourceLineNo">571</span>            } catch (IOException e) {<a name="line.571"></a>
+<span class="sourceLineNo">572</span>                throw new MalformedStreamException("Stream ended unexpectedly");<a name="line.572"></a>
+<span class="sourceLineNo">573</span>            }<a name="line.573"></a>
+<span class="sourceLineNo">574</span>            if (++size &gt; HEADER_PART_SIZE_MAX) {<a name="line.574"></a>
+<span class="sourceLineNo">575</span>                throw new MalformedStreamException(<a name="line.575"></a>
+<span class="sourceLineNo">576</span>                        format("Header section has more than %s bytes (maybe it is not properly terminated)",<a name="line.576"></a>
+<span class="sourceLineNo">577</span>                               Integer.valueOf(HEADER_PART_SIZE_MAX)));<a name="line.577"></a>
+<span class="sourceLineNo">578</span>            }<a name="line.578"></a>
+<span class="sourceLineNo">579</span>            if (b == HEADER_SEPARATOR[i]) {<a name="line.579"></a>
+<span class="sourceLineNo">580</span>                i++;<a name="line.580"></a>
+<span class="sourceLineNo">581</span>            } else {<a name="line.581"></a>
+<span class="sourceLineNo">582</span>                i = 0;<a name="line.582"></a>
+<span class="sourceLineNo">583</span>            }<a name="line.583"></a>
+<span class="sourceLineNo">584</span>            baos.write(b);<a name="line.584"></a>
+<span class="sourceLineNo">585</span>        }<a name="line.585"></a>
+<span class="sourceLineNo">586</span><a name="line.586"></a>
+<span class="sourceLineNo">587</span>        String headers = null;<a name="line.587"></a>
+<span class="sourceLineNo">588</span>        if (headerEncoding != null) {<a name="line.588"></a>
+<span class="sourceLineNo">589</span>            try {<a name="line.589"></a>
+<span class="sourceLineNo">590</span>                headers = baos.toString(headerEncoding);<a name="line.590"></a>
+<span class="sourceLineNo">591</span>            } catch (UnsupportedEncodingException e) {<a name="line.591"></a>
+<span class="sourceLineNo">592</span>                // Fall back to platform default if specified encoding is not<a name="line.592"></a>
+<span class="sourceLineNo">593</span>                // supported.<a name="line.593"></a>
+<span class="sourceLineNo">594</span>                headers = baos.toString();<a name="line.594"></a>
+<span class="sourceLineNo">595</span>            }<a name="line.595"></a>
+<span class="sourceLineNo">596</span>        } else {<a name="line.596"></a>
+<span class="sourceLineNo">597</span>            headers = baos.toString();<a name="line.597"></a>
+<span class="sourceLineNo">598</span>        }<a name="line.598"></a>
+<span class="sourceLineNo">599</span><a name="line.599"></a>
+<span class="sourceLineNo">600</span>        return headers;<a name="line.600"></a>
 <span class="sourceLineNo">601</span>    }<a name="line.601"></a>
 <span class="sourceLineNo">602</span><a name="line.602"></a>
 <span class="sourceLineNo">603</span>    /**<a name="line.603"></a>
-<span class="sourceLineNo">604</span>     * &lt;p&gt; Reads &lt;code&gt;body-data&lt;/code&gt; from the current<a name="line.604"></a>
-<span class="sourceLineNo">605</span>     * &lt;code&gt;encapsulation&lt;/code&gt; and discards it.<a name="line.605"></a>
-<span class="sourceLineNo">606</span>     *<a name="line.606"></a>
-<span class="sourceLineNo">607</span>     * &lt;p&gt;Use this method to skip encapsulations you don't need or don't<a name="line.607"></a>
-<span class="sourceLineNo">608</span>     * understand.<a name="line.608"></a>
-<span class="sourceLineNo">609</span>     *<a name="line.609"></a>
-<span class="sourceLineNo">610</span>     * @return The amount of data discarded.<a name="line.610"></a>
-<span class="sourceLineNo">611</span>     *<a name="line.611"></a>
-<span class="sourceLineNo">612</span>     * @throws MalformedStreamException if the stream ends unexpectedly.<a name="line.612"></a>
-<span class="sourceLineNo">613</span>     * @throws IOException              if an i/o error occurs.<a name="line.613"></a>
-<span class="sourceLineNo">614</span>     */<a name="line.614"></a>
-<span class="sourceLineNo">615</span>    public int discardBodyData() throws MalformedStreamException, IOException {<a name="line.615"></a>
-<span class="sourceLineNo">616</span>        return readBodyData(null);<a name="line.616"></a>
-<span class="sourceLineNo">617</span>    }<a name="line.617"></a>
-<span class="sourceLineNo">618</span><a name="line.618"></a>
-<span class="sourceLineNo">619</span>    /**<a name="line.619"></a>
-<span class="sourceLineNo">620</span>     * Finds the beginning of the first &lt;code&gt;encapsulation&lt;/code&gt;.<a name="line.620"></a>
-<span class="sourceLineNo">621</span>     *<a name="line.621"></a>
-<span class="sourceLineNo">622</span>     * @return &lt;code&gt;true&lt;/code&gt; if an &lt;code&gt;encapsulation&lt;/code&gt; was found in<a name="line.622"></a>
-<span class="sourceLineNo">623</span>     *         the stream.<a name="line.623"></a>
-<span class="sourceLineNo">624</span>     *<a name="line.624"></a>
-<span class="sourceLineNo">625</span>     * @throws IOException if an i/o error occurs.<a name="line.625"></a>
-<span class="sourceLineNo">626</span>     */<a name="line.626"></a>
-<span class="sourceLineNo">627</span>    public boolean skipPreamble() throws IOException {<a name="line.627"></a>
-<span class="sourceLineNo">628</span>        // First delimiter may be not preceeded with a CRLF.<a name="line.628"></a>
-<span class="sourceLineNo">629</span>        System.arraycopy(boundary, 2, boundary, 0, boundary.length - 2);<a name="line.629"></a>
-<span class="sourceLineNo">630</span>        boundaryLength = boundary.length - 2;<a name="line.630"></a>
-<span class="sourceLineNo">631</span>        try {<a name="line.631"></a>
-<span class="sourceLineNo">632</span>            // Discard all data up to the delimiter.<a name="line.632"></a>
-<span class="sourceLineNo">633</span>            discardBodyData();<a name="line.633"></a>
+<span class="sourceLineNo">604</span>     * &lt;p&gt;Reads &lt;code&gt;body-data&lt;/code&gt; from the current<a name="line.604"></a>
+<span class="sourceLineNo">605</span>     * &lt;code&gt;encapsulation&lt;/code&gt; and writes its contents into the<a name="line.605"></a>
+<span class="sourceLineNo">606</span>     * output &lt;code&gt;Stream&lt;/code&gt;.<a name="line.606"></a>
+<span class="sourceLineNo">607</span>     *<a name="line.607"></a>
+<span class="sourceLineNo">608</span>     * &lt;p&gt;Arbitrary large amounts of data can be processed by this<a name="line.608"></a>
+<span class="sourceLineNo">609</span>     * method using a constant size buffer. (see {@link<a name="line.609"></a>
+<span class="sourceLineNo">610</span>     * #MultipartStream(InputStream,byte[],int,<a name="line.610"></a>
+<span class="sourceLineNo">611</span>     *   MultipartStream.ProgressNotifier) constructor}).<a name="line.611"></a>
+<span class="sourceLineNo">612</span>     *<a name="line.612"></a>
+<span class="sourceLineNo">613</span>     * @param output The &lt;code&gt;Stream&lt;/code&gt; to write data into. May<a name="line.613"></a>
+<span class="sourceLineNo">614</span>     *               be null, in which case this method is equivalent<a name="line.614"></a>
+<span class="sourceLineNo">615</span>     *               to {@link #discardBodyData()}.<a name="line.615"></a>
+<span class="sourceLineNo">616</span>     *<a name="line.616"></a>
+<span class="sourceLineNo">617</span>     * @return the amount of data written.<a name="line.617"></a>
+<span class="sourceLineNo">618</span>     *<a name="line.618"></a>
+<span class="sourceLineNo">619</span>     * @throws MalformedStreamException if the stream ends unexpectedly.<a name="line.619"></a>
+<span class="sourceLineNo">620</span>     * @throws IOException              if an i/o error occurs.<a name="line.620"></a>
+<span class="sourceLineNo">621</span>     */<a name="line.621"></a>
+<span class="sourceLineNo">622</span>    public int readBodyData(OutputStream output)<a name="line.622"></a>
+<span class="sourceLineNo">623</span>            throws MalformedStreamException, IOException {<a name="line.623"></a>
+<span class="sourceLineNo">624</span>        return (int) Streams.copy(newInputStream(), output, false); // N.B. Streams.copy closes the input stream<a name="line.624"></a>
+<span class="sourceLineNo">625</span>    }<a name="line.625"></a>
+<span class="sourceLineNo">626</span><a name="line.626"></a>
+<span class="sourceLineNo">627</span>    /**<a name="line.627"></a>
+<span class="sourceLineNo">628</span>     * Creates a new {@link ItemInputStream}.<a name="line.628"></a>
+<span class="sourceLineNo">629</span>     * @return A new instance of {@link ItemInputStream}.<a name="line.629"></a>
+<span class="sourceLineNo">630</span>     */<a name="line.630"></a>
+<span class="sourceLineNo">631</span>    ItemInputStream newInputStream() {<a name="line.631"></a>
+<span class="sourceLineNo">632</span>        return new ItemInputStream();<a name="line.632"></a>
+<span class="sourceLineNo">633</span>    }<a name="line.633"></a>
 <span class="sourceLineNo">634</span><a name="line.634"></a>
-<span class="sourceLineNo">635</span>            // Read boundary - if succeeded, the stream contains an<a name="line.635"></a>
-<span class="sourceLineNo">636</span>            // encapsulation.<a name="line.636"></a>
-<span class="sourceLineNo">637</span>            return readBoundary();<a name="line.637"></a>
-<span class="sourceLineNo">638</span>        } catch (MalformedStreamException e) {<a name="line.638"></a>
-<span class="sourceLineNo">639</span>            return false;<a name="line.639"></a>
-<span class="sourceLineNo">640</span>        } finally {<a name="line.640"></a>
-<span class="sourceLineNo">641</span>            // Restore delimiter.<a name="line.641"></a>
-<span class="sourceLineNo">642</span>            System.arraycopy(boundary, 0, boundary, 2, boundary.length - 2);<a name="line.642"></a>
-<span class="sourceLineNo">643</span>            boundaryLength = boundary.length;<a name="line.643"></a>
-<span class="sourceLineNo">644</span>            boundary[0] = CR;<a name="line.644"></a>
-<span class="sourceLineNo">645</span>            boundary[1] = LF;<a name="line.645"></a>
-<span class="sourceLineNo">646</span>        }<a name="line.646"></a>
-<span class="sourceLineNo">647</span>    }<a name="line.647"></a>
-<span class="sourceLineNo">648</span><a name="line.648"></a>
-<span class="sourceLineNo">649</span>    /**<a name="line.649"></a>
-<span class="sourceLineNo">650</span>     * Compares &lt;code&gt;count&lt;/code&gt; first bytes in the arrays<a name="line.650"></a>
-<span class="sourceLineNo">651</span>     * &lt;code&gt;a&lt;/code&gt; and &lt;code&gt;b&lt;/code&gt;.<a name="line.651"></a>
-<span class="sourceLineNo">652</span>     *<a name="line.652"></a>
-<span class="sourceLineNo">653</span>     * @param a     The first array to compare.<a name="line.653"></a>
-<span class="sourceLineNo">654</span>     * @param b     The second array to compare.<a name="line.654"></a>
-<span class="sourceLineNo">655</span>     * @param count How many bytes should be compared.<a name="line.655"></a>
+<span class="sourceLineNo">635</span>    /**<a name="line.635"></a>
+<span class="sourceLineNo">636</span>     * &lt;p&gt; Reads &lt;code&gt;body-data&lt;/code&gt; from the current<a name="line.636"></a>
+<span class="sourceLineNo">637</span>     * &lt;code&gt;encapsulation&lt;/code&gt; and discards it.<a name="line.637"></a>
+<span class="sourceLineNo">638</span>     *<a name="line.638"></a>
+<span class="sourceLineNo">639</span>     * &lt;p&gt;Use this method to skip encapsulations you don't need or don't<a name="line.639"></a>
+<span class="sourceLineNo">640</span>     * understand.<a name="line.640"></a>
+<span class="sourceLineNo">641</span>     *<a name="line.641"></a>
+<span class="sourceLineNo">642</span>     * @return The amount of data discarded.<a name="line.642"></a>
+<span class="sourceLineNo">643</span>     *<a name="line.643"></a>
+<span class="sourceLineNo">644</span>     * @throws MalformedStreamException if the stream ends unexpectedly.<a name="line.644"></a>
+<span class="sourceLineNo">645</span>     * @throws IOException              if an i/o error occurs.<a name="line.645"></a>
+<span class="sourceLineNo">646</span>     */<a name="line.646"></a>
+<span class="sourceLineNo">647</span>    public int discardBodyData() throws MalformedStreamException, IOException {<a name="line.647"></a>
+<span class="sourceLineNo">648</span>        return readBodyData(null);<a name="line.648"></a>
+<span class="sourceLineNo">649</span>    }<a name="line.649"></a>
+<span class="sourceLineNo">650</span><a name="line.650"></a>
+<span class="sourceLineNo">651</span>    /**<a name="line.651"></a>
+<span class="sourceLineNo">652</span>     * Finds the beginning of the first &lt;code&gt;encapsulation&lt;/code&gt;.<a name="line.652"></a>
+<span class="sourceLineNo">653</span>     *<a name="line.653"></a>
+<span class="sourceLineNo">654</span>     * @return &lt;code&gt;true&lt;/code&gt; if an &lt;code&gt;encapsulation&lt;/code&gt; was found in<a name="line.654"></a>
+<span class="sourceLineNo">655</span>     *         the stream.<a name="line.655"></a>
 <span class="sourceLineNo">656</span>     *<a name="line.656"></a>
-<span class="sourceLineNo">657</span>     * @return &lt;code&gt;true&lt;/code&gt; if &lt;code&gt;count&lt;/code&gt; first bytes in arrays<a name="line.657"></a>
-<span class="sourceLineNo">658</span>     *         &lt;code&gt;a&lt;/code&gt; and &lt;code&gt;b&lt;/code&gt; are equal.<a name="line.658"></a>
-<span class="sourceLineNo">659</span>     */<a name="line.659"></a>
-<span class="sourceLineNo">660</span>    public static boolean arrayequals(byte[] a,<a name="line.660"></a>
-<span class="sourceLineNo">661</span>            byte[] b,<a name="line.661"></a>
-<span class="sourceLineNo">662</span>            int count) {<a name="line.662"></a>
-<span class="sourceLineNo">663</span>        for (int i = 0; i &lt; count; i++) {<a name="line.663"></a>
-<span class="sourceLineNo">664</span>            if (a[i] != b[i]) {<a name="line.664"></a>
-<span class="sourceLineNo">665</span>                return false;<a name="line.665"></a>
-<span class="sourceLineNo">666</span>            }<a name="line.666"></a>
-<span class="sourceLineNo">667</span>        }<a name="line.667"></a>
-<span class="sourceLineNo">668</span>        return true;<a name="line.668"></a>
-<span class="sourceLineNo">669</span>    }<a name="line.669"></a>
-<span class="sourceLineNo">670</span><a name="line.670"></a>
-<span class="sourceLineNo">671</span>    /**<a name="line.671"></a>
-<span class="sourceLineNo">672</span>     * Searches for a byte of specified value in the &lt;code&gt;buffer&lt;/code&gt;,<a name="line.672"></a>
-<span class="sourceLineNo">673</span>     * starting at the specified &lt;code&gt;position&lt;/code&gt;.<a name="line.673"></a>
-<span class="sourceLineNo">674</span>     *<a name="line.674"></a>
-<span class="sourceLineNo">675</span>     * @param value The value to find.<a name="line.675"></a>
-<span class="sourceLineNo">676</span>     * @param pos   The starting position for searching.<a name="line.676"></a>
-<span class="sourceLineNo">677</span>     *<a name="line.677"></a>
-<span class="sourceLineNo">678</span>     * @return The position of byte found, counting from beginning of the<a name="line.678"></a>
-<span class="sourceLineNo">679</span>     *         &lt;code&gt;buffer&lt;/code&gt;, or &lt;code&gt;-1&lt;/code&gt; if not found.<a name="line.679"></a>
-<span class="sourceLineNo">680</span>     */<a name="line.680"></a>
-<span class="sourceLineNo">681</span>    protected int findByte(byte value,<a name="line.681"></a>
-<span class="sourceLineNo">682</span>            int pos) {<a name="line.682"></a>
-<span class="sourceLineNo">683</span>        for (int i = pos; i &lt; tail; i++) {<a name="line.683"></a>
-<span class="sourceLineNo">684</span>            if (buffer[i] == value) {<a name="line.684"></a>
-<span class="sourceLineNo">685</span>                return i;<a name="line.685"></a>
-<span class="sourceLineNo">686</span>            }<a name="line.686"></a>
-<span class="sourceLineNo">687</span>        }<a name="line.687"></a>
-<span class="sourceLineNo">688</span><a name="line.688"></a>
-<span class="sourceLineNo">689</span>        return -1;<a name="line.689"></a>
-<span class="sourceLineNo">690</span>    }<a name="line.690"></a>
-<span class="sourceLineNo">691</span><a name="line.691"></a>
-<span class="sourceLineNo">692</span>    /**<a name="line.692"></a>
-<span class="sourceLineNo">693</span>     * Searches for the &lt;code&gt;boundary&lt;/code&gt; in the &lt;code&gt;buffer&lt;/code&gt;<a name="line.693"></a>
-<span class="sourceLineNo">694</span>     * region delimited by &lt;code&gt;head&lt;/code&gt; and &lt;code&gt;tail&lt;/code&gt;.<a name="line.694"></a>
-<span class="sourceLineNo">695</span>     *<a name="line.695"></a>
-<span class="sourceLineNo">696</span>     * @return The position of the boundary found, counting from the<a name="line.696"></a>
-<span class="sourceLineNo">697</span>     *         beginning of the &lt;code&gt;buffer&lt;/code&gt;, or &lt;code&gt;-1&lt;/code&gt; if<a name="line.697"></a>
-<span class="sourceLineNo">698</span>     *         not found.<a name="line.698"></a>
-<span class="sourceLineNo">699</span>     */<a name="line.699"></a>
-<span class="sourceLineNo">700</span>    protected int findSeparator() {<a name="line.700"></a>
-<span class="sourceLineNo">701</span>        int first;<a name="line.701"></a>
-<span class="sourceLineNo">702</span>        int match = 0;<a name="line.702"></a>
-<span class="sourceLineNo">703</span>        int maxpos = tail - boundaryLength;<a name="line.703"></a>
-<span class="sourceLineNo">704</span>        for (first = head; first &lt;= maxpos &amp;&amp; match != boundaryLength; first++) {<a name="line.704"></a>
-<span class="sourceLineNo">705</span>            first = findByte(boundary[0], first);<a name="line.705"></a>
-<span class="sourceLineNo">706</span>            if (first == -1 || first &gt; maxpos) {<a name="line.706"></a>
-<span class="sourceLineNo">707</span>                return -1;<a name="line.707"></a>
-<span class="sourceLineNo">708</span>            }<a name="line.708"></a>
-<span class="sourceLineNo">709</span>            for (match = 1; match &lt; boundaryLength; match++) {<a name="line.709"></a>
-<span class="sourceLineNo">710</span>                if (buffer[first + match] != boundary[match]) {<a name="line.710"></a>
-<span class="sourceLineNo">711</span>                    break;<a name="line.711"></a>
-<span class="sourceLineNo">712</span>                }<a name="line.712"></a>
-<span class="sourceLineNo">713</span>            }<a name="line.713"></a>
-<span class="sourceLineNo">714</span>        }<a name="line.714"></a>
-<span class="sourceLineNo">715</span>        if (match == boundaryLength) {<a name="line.715"></a>
-<span class="sourceLineNo">716</span>            return first - 1;<a name="line.716"></a>
-<span class="sourceLineNo">717</span>        }<a name="line.717"></a>
-<span class="sourceLineNo">718</span>        return -1;<a name="line.718"></a>
-<span class="sourceLineNo">719</span>    }<a name="line.719"></a>
-<span class="sourceLineNo">720</span><a name="line.720"></a>
-<span class="sourceLineNo">721</span>    /**<a name="line.721"></a>
-<span class="sourceLineNo">722</span>     * Thrown to indicate that the input stream fails to follow the<a name="line.722"></a>
-<span class="sourceLineNo">723</span>     * required syntax.<a name="line.723"></a>
-<span class="sourceLineNo">724</span>     */<a name="line.724"></a>
-<span class="sourceLineNo">725</span>    public static class MalformedStreamException extends IOException {<a name="line.725"></a>
-<span class="sourceLineNo">726</span><a name="line.726"></a>
-<span class="sourceLineNo">727</span>        /**<a name="line.727"></a>
-<span class="sourceLineNo">728</span>         * The UID to use when serializing this instance.<a name="line.728"></a>
-<span class="sourceLineNo">729</span>         */<a name="line.729"></a>
-<span class="sourceLineNo">730</span>        private static final long serialVersionUID = 6466926458059796677L;<a name="line.730"></a>
-<span class="sourceLineNo">731</span><a name="line.731"></a>
-<span class="sourceLineNo">732</span>        /**<a name="line.732"></a>

[... 704 lines stripped ...]


Mime
View raw message