Index: 3rdParty_sources/servlet-api/javax/servlet/annotation/MultipartConfig.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r188531e2b734df509672788d897e1030e4b1a24a --- 3rdParty_sources/servlet-api/javax/servlet/annotation/MultipartConfig.java (.../MultipartConfig.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ 3rdParty_sources/servlet-api/javax/servlet/annotation/MultipartConfig.java (.../MultipartConfig.java) (revision 188531e2b734df509672788d897e1030e4b1a24a) @@ -1,19 +1,19 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 2008-2010 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017-2017 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development * and Distribution License("CDDL") (collectively, the "License"). You * may not use this file except in compliance with the License. You can * obtain a copy of the License at - * https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html - * or packager/legal/LICENSE.txt. See the License for the specific + * https://oss.oracle.com/licenses/CDDL+GPL-1.1 + * or LICENSE.txt. See the License for the specific * language governing permissions and limitations under the License. * * When distributing the software, include this License Header Notice in each - * file and include the License file at packager/legal/LICENSE.txt. + * file and include the License file at LICENSE.txt. * * GPL Classpath Exception: * Oracle designates this particular file as subject to the "Classpath" @@ -63,13 +63,17 @@ /** * The directory location where files will be stored + * + * @return the directory location where files will be stored */ String location() default ""; /** * The maximum size allowed for uploaded files. * *

The default is -1L, which means unlimited. + * + * @return the maximum size allowed for uploaded files */ long maxFileSize() default -1L; @@ -78,11 +82,15 @@ * requests * *

The default is -1L, which means unlimited. + * + * @return the maximum size allowed for multipart/form-data requests */ long maxRequestSize() default -1L; /** * The size threshold after which the file will be written to disk + * + * @return the size threshold after which the file will be written to disk */ int fileSizeThreshold() default 0; }