Author: markt
Date: Tue Nov 17 21:17:32 2009
New Revision: 881530
URL: http://svn.apache.org/viewvc?rev=881530&view=rev
Log:
Remove some more deprecated code
Modified:
tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/FileUploadBase.java
tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/MultipartStream.java
Modified:
tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/FileUploadBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/FileUploadBase.java?rev=881530&r1=881529&r2=881530&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/FileUploadBase.java
(original)
+++
tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/FileUploadBase.java
Tue Nov 17 21:17:32 2009
@@ -1053,38 +1053,6 @@
}
/**
- * Thrown to indicate that the request size is not specified. In other
- * words, it is thrown, if the content-length header is missing or
- * contains the value -1.
- * @deprecated As of commons-fileupload 1.2, the presence of a
- * content-length header is no longer required.
- */
- public static class UnknownSizeException
- extends FileUploadException {
- /** The exceptions UID, for serializing an instance.
- */
- private static final long serialVersionUID = 7062279004812015273L;
-
- /**
- * Constructs a <code>UnknownSizeException</code> with no
- * detail message.
- */
- public UnknownSizeException() {
- super();
- }
-
- /**
- * Constructs an <code>UnknownSizeException</code> with
- * the specified detail message.
- *
- * @param message The detail message.
- */
- public UnknownSizeException(String message) {
- super(message);
- }
- }
-
- /**
* Thrown to indicate that the request size exceeds the configured maximum.
*/
public static class SizeLimitExceededException
Modified:
tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/MultipartStream.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/MultipartStream.java?rev=881530&r1=881529&r2=881530&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/MultipartStream.java
(original)
+++
tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/MultipartStream.java
Tue Nov 17 21:17:32 2009
@@ -270,40 +270,6 @@
// ----------------------------------------------------------- Constructors
/**
- * Creates a new instance.
- * @deprecated Use {...@link #MultipartStream(InputStream, byte[],
- * org.apache.commons.fileupload.MultipartStream.ProgressNotifier)},
- * or {...@link #MultipartStream(InputStream, byte[], int,
- * org.apache.commons.fileupload.MultipartStream.ProgressNotifier)}
- */
- public MultipartStream() {
- this(null, null, null);
- }
-
- /**
- * <p> Constructs a <code>MultipartStream</code> with a custom size buffer
- * and no progress notifier.
- *
- * <p> Note that the buffer must be at least big enough to contain the
- * boundary string, plus 4 characters for CR/LF and double dash, plus at
- * least one byte of data. Too small a buffer size setting will degrade
- * performance.
- *
- * @param input The <code>InputStream</code> to serve as a data source.
- * @param boundary The token used for dividing the stream into
- * <code>encapsulations</code>.
- * @param bufSize The size of the buffer to be used, in bytes.
- *
- * @see #MultipartStream(InputStream, byte[],
- * MultipartStream.ProgressNotifier)
- * @deprecated Use {...@link #MultipartStream(InputStream, byte[], int,
- * org.apache.commons.fileupload.MultipartStream.ProgressNotifier)}.
- */
- public MultipartStream(InputStream input, byte[] boundary, int bufSize) {
- this(input, boundary, bufSize, null);
- }
-
- /**
* <p> Constructs a <code>MultipartStream</code> with a custom size buffer.
*
* <p> Note that the buffer must be at least big enough to contain the
@@ -363,23 +329,6 @@
this(input, boundary, DEFAULT_BUFSIZE, pNotifier);
}
- /**
- * <p> Constructs a <code>MultipartStream</code> with a default size
buffer.
- *
- * @param input The <code>InputStream</code> to serve as a data source.
- * @param boundary The token used for dividing the stream into
- * <code>encapsulations</code>.
- *
- * @deprecated Use {...@link #MultipartStream(InputStream, byte[],
- * MultipartStream.ProgressNotifier)}.
- * @see #MultipartStream(InputStream, byte[], int,
- * MultipartStream.ProgressNotifier)
- */
- public MultipartStream(InputStream input,
- byte[] boundary) {
- this(input, boundary, DEFAULT_BUFSIZE, null);
- }
-
// --------------------------------------------------------- Public methods
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
