Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed javadoc errors

This commit is contained in:
Greg Wilkins 2015-07-23 09:35:38 +10:00
parent 3244088565
commit 830b126e43
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
jetty-server/src/main/java/org/eclipse/jetty/server/HttpConfiguration.java
View File

@ -210,7 +210,7 @@ public class HttpConfiguration
* to the total operation (as opposed to the idle timeout that applies to the time no
* data is being sent).
* @return -1, for no blocking timeout (default), 0 for a blocking timeout equal to the
* idle timeout; >0 for a timeout in ms applied to the total blocking operation.
* idle timeout; >0 for a timeout in ms applied to the total blocking operation.
*/
@ManagedAttribute("Timeout in MS for blocking operations.")
public long getBlockingTimeout()
@ -224,7 +224,7 @@ public class HttpConfiguration
* to the total operation (as opposed to the idle timeout that applies to the time no
* data is being sent).
* @param blockingTimeout -1, for no blocking timeout (default), 0 for a blocking timeout equal to the
* idle timeout; >0 for a timeout in ms applied to the total blocking operation.
* idle timeout; >0 for a timeout in ms applied to the total blocking operation.
*/
public void setBlockingTimeout(long blockingTimeout)
{

4
jetty-servlets/src/main/java/org/eclipse/jetty/servlets/ConcatServlet.java
View File

@ -44,13 +44,13 @@ import org.eclipse.jetty.util.URIUtil;
* relative to the context root. So these script tags:</p>
* <pre>
* &lt;script type="text/javascript" src="../js/behaviour.js"&gt;&lt;/script&gt;
* &lt;script type="text/javascript" src="../js/ajax.js&/chat/chat.js"&gt;&lt;/script&gt;
* &lt;script type="text/javascript" src="../js/ajax.js"&gt;&lt;/script&gt;
* &lt;script type="text/javascript" src="../chat/chat.js"&gt;&lt;/script&gt;
* </pre>
* <p>can be replaced with the single tag (with the {@code ConcatServlet}
* mapped to {@code /concat}):</p>
* <pre>
* &lt;script type="text/javascript" src="../concat?/js/behaviour.js&/js/ajax.js&/chat/chat.js"&gt;&lt;/script&gt;
* &lt;script type="text/javascript" src="../concat?/js/behaviour.js&amp;/js/ajax.js&amp;/chat/chat.js"&gt;&lt;/script&gt;
* </pre>
* <p>The {@link ServletContext#getMimeType(String)} method is used to determine the
* mime type of each resource. If the types of all resources do not match, then a 415