felix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
Subject svn commit: r1780867 - in /felix/trunk/http/api/src/main/java/org/osgi/service/http: runtime/dto/ServletDTO.java whiteboard/HttpWhiteboardConstants.java
Date Mon, 30 Jan 2017 07:01:18 GMT
Author: cziegeler
Date: Mon Jan 30 07:01:18 2017
New Revision: 1780867

URL: http://svn.apache.org/viewvc?rev=1780867&view=rev
Log:
Update http whiteboard API [RFC 223] to latest draft. Git commit id 7593d04

Modified:
    felix/trunk/http/api/src/main/java/org/osgi/service/http/runtime/dto/ServletDTO.java
    felix/trunk/http/api/src/main/java/org/osgi/service/http/whiteboard/HttpWhiteboardConstants.java

Modified: felix/trunk/http/api/src/main/java/org/osgi/service/http/runtime/dto/ServletDTO.java
URL: http://svn.apache.org/viewvc/felix/trunk/http/api/src/main/java/org/osgi/service/http/runtime/dto/ServletDTO.java?rev=1780867&r1=1780866&r2=1780867&view=diff
==============================================================================
--- felix/trunk/http/api/src/main/java/org/osgi/service/http/runtime/dto/ServletDTO.java (original)
+++ felix/trunk/http/api/src/main/java/org/osgi/service/http/runtime/dto/ServletDTO.java Mon
Jan 30 07:01:18 2017
@@ -41,26 +41,39 @@ public class ServletDTO extends BaseServ
 	public boolean				multipartEnabled;
 
 	/**
-	 * Specifies the size threshold after which the file will be written to disk.
+	 * Specifies the size threshold after which the file will be written to
+	 * disk. If multipart is not enabled for this servlet, {@code 0} is
+	 * returned.
+	 * 
 	 * @since 1.1
+	 * @see #multipartEnabled
 	 */
 	public int					multipartFileSizeThreshold;
 
 	/**
-	 * Specifies the location where the files can be stored on disk.
+	 * Specifies the location where the files can be stored on disk. If
+	 * multipart is not enabled for this servlet, {@code null} is returned.
+	 * 
 	 * @since 1.1
+	 * @see #multipartEnabled
 	 */
 	public String				multipartLocation;
 
 	/**
-	 * Specifies the maximum size of a file being uploaded.
+	 * Specifies the maximum size of a file being uploaded. If multipart is not
+	 * enabled for this servlet, {@code 0} is returned.
+	 * 
 	 * @since 1.1
+	 * @see #multipartEnabled
 	 */
 	public long					multipartMaxFileSize;
 
 	/**
-	 * Specifies the maximum request size.
+	 * Specifies the maximum request size. If multipart is not enabled for this
+	 * servlet, {@code 0} is returned.
+	 * 
 	 * @since 1.1
+	 * @see #multipartEnabled
 	 */
 	public long					multipartMaxRequestSize;
 }

Modified: felix/trunk/http/api/src/main/java/org/osgi/service/http/whiteboard/HttpWhiteboardConstants.java
URL: http://svn.apache.org/viewvc/felix/trunk/http/api/src/main/java/org/osgi/service/http/whiteboard/HttpWhiteboardConstants.java?rev=1780867&r1=1780866&r2=1780867&view=diff
==============================================================================
--- felix/trunk/http/api/src/main/java/org/osgi/service/http/whiteboard/HttpWhiteboardConstants.java
(original)
+++ felix/trunk/http/api/src/main/java/org/osgi/service/http/whiteboard/HttpWhiteboardConstants.java
Mon Jan 30 07:01:18 2017
@@ -238,7 +238,10 @@ public final class HttpWhiteboardConstan
 	 * Service property specifying the size threshold after which the file will
 	 * be written to disk.
 	 * <p>
-	 * When not set the default threshold is determined by the implementation.
+	 * When not set or when the value is not valid, the default threshold is
+	 * determined by the implementation. This property is only evaluated if
+	 * {@link #HTTP_WHITEBOARD_SERVLET_MULTIPART_ENABLED} is set to {@code true}
+	 * .
 	 * <p>
 	 * The value of this service property must be of type {@code Integer}.
 	 *
@@ -252,7 +255,9 @@ public final class HttpWhiteboardConstan
 	 * disk.
 	 * <p>
 	 * When not set the default location is defined by the value of the system
-	 * property "java.io.tmpdir".
+	 * property "java.io.tmpdir". This property is only evaluated if
+	 * {@link #HTTP_WHITEBOARD_SERVLET_MULTIPART_ENABLED} is set to {@code true}
+	 * .
 	 * <p>
 	 * The value of this service property must be of type {@code String}.
 	 *
@@ -264,7 +269,10 @@ public final class HttpWhiteboardConstan
 	/**
 	 * Service property specifying the maximum size of a file being uploaded.
 	 * <p>
-	 * When not set the default maximum size is -1 (no maximum size).
+	 * When not set or when the value is not valid, the default maximum size is
+	 * [@code -1} (no maximum size). This property is only evaluated if
+	 * {@link #HTTP_WHITEBOARD_SERVLET_MULTIPART_ENABLED} is set to {@code true}
+	 * .
 	 * <p>
 	 * The value of this service property must be of type {@code Long}.
 	 *
@@ -276,7 +284,10 @@ public final class HttpWhiteboardConstan
 	/**
 	 * Service property specifying the maximum request size.
 	 * <p>
-	 * When not set the default maximum request size is -1 (no maximum size).
+	 * When not set or when the value is not valid, the default maximum request
+	 * size is {@code -1} (no maximum size). This property is only evaluated if
+	 * {@link #HTTP_WHITEBOARD_SERVLET_MULTIPART_ENABLED} is set to {@code true}
+	 * .
 	 * <p>
 	 * The value of this service property must be of type {@code Long}.
 	 *



Mime
View raw message