You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2019/05/09 19:30:45 UTC
[tomcat] branch master updated (659b28c -> cfc165d)
This is an automated email from the ASF dual-hosted git repository.
markt pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git.
from 659b28c Avoid possible NPE on commit
new 97e7bfb Fix Javadoc warnings
new e838da5 Fix Javadoc warning
new cfc165d Add @Deprecated to deprecated methods to silence IDE warnings
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
java/org/apache/catalina/servlets/DefaultServlet.java | 5 ++++-
java/org/apache/coyote/AbstractProtocol.java | 15 +++++++++++++++
java/org/apache/tomcat/util/net/AbstractEndpoint.java | 15 +++++++++++++++
3 files changed, 34 insertions(+), 1 deletion(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 03/03: Add @Deprecated to deprecated methods to silence
IDE warnings
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit cfc165d667e7dda1389396b20d58ee06316340fb
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu May 9 20:30:23 2019 +0100
Add @Deprecated to deprecated methods to silence IDE warnings
---
java/org/apache/catalina/servlets/DefaultServlet.java | 3 +++
1 file changed, 3 insertions(+)
diff --git a/java/org/apache/catalina/servlets/DefaultServlet.java b/java/org/apache/catalina/servlets/DefaultServlet.java
index b5d2b14..86956fa 100644
--- a/java/org/apache/catalina/servlets/DefaultServlet.java
+++ b/java/org/apache/catalina/servlets/DefaultServlet.java
@@ -1574,6 +1574,7 @@ public class DefaultServlet extends HttpServlet {
*
* @deprecated Use {@link #render(HttpServletRequest, String, WebResource, String)} instead
*/
+ @Deprecated
protected InputStream render(String contextPath, WebResource resource, String encoding)
throws IOException, ServletException {
@@ -1620,6 +1621,7 @@ public class DefaultServlet extends HttpServlet {
* @throws ServletException rendering error
* @deprecated Use {@link #render(HttpServletRequest, String, WebResource, String)} instead
*/
+ @Deprecated
protected InputStream renderXml(String contextPath, WebResource resource, Source xsltSource,
String encoding)
throws ServletException, IOException
@@ -1774,6 +1776,7 @@ public class DefaultServlet extends HttpServlet {
*
* @deprecated Use {@link #renderHtml(HttpServletRequest, String, WebResource, String)} instead
*/
+ @Deprecated
protected InputStream renderHtml(String contextPath, WebResource resource, String encoding)
throws IOException {
return renderHtml(null, contextPath, resource, encoding);
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 02/03: Fix Javadoc warning
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit e838da5109fdad1331cb3a6a51c3860b01ee9896
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu May 9 20:29:35 2019 +0100
Fix Javadoc warning
---
java/org/apache/catalina/servlets/DefaultServlet.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/java/org/apache/catalina/servlets/DefaultServlet.java b/java/org/apache/catalina/servlets/DefaultServlet.java
index 97f6b90..b5d2b14 100644
--- a/java/org/apache/catalina/servlets/DefaultServlet.java
+++ b/java/org/apache/catalina/servlets/DefaultServlet.java
@@ -2785,7 +2785,7 @@ public class DefaultServlet extends HttpServlet {
* @param resources The array to sort.
* @param order The ordering string.
*
- * @see {@link #getOrder(String)}
+ * @see #getOrder(String)
*/
public void sort(WebResource[] resources, String order) {
Comparator<WebResource> comparator = getComparator(order);
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 01/03: Fix Javadoc warnings
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 97e7bfbbb492a337044adf377a1d1ee9b0f8be2e
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu May 9 20:28:59 2019 +0100
Fix Javadoc warnings
---
java/org/apache/coyote/AbstractProtocol.java | 15 +++++++++++++++
java/org/apache/tomcat/util/net/AbstractEndpoint.java | 15 +++++++++++++++
2 files changed, 30 insertions(+)
diff --git a/java/org/apache/coyote/AbstractProtocol.java b/java/org/apache/coyote/AbstractProtocol.java
index 4e35f43..6b93ef4 100644
--- a/java/org/apache/coyote/AbstractProtocol.java
+++ b/java/org/apache/coyote/AbstractProtocol.java
@@ -310,9 +310,24 @@ public abstract class AbstractProtocol<S> implements ProtocolHandler,
return endpoint.getConnectionCount();
}
+ /**
+ * NO-OP.
+ *
+ * @param threadCount Unused
+ *
+ * @Deprecated Will be removed in Tomcat 10.
+ */
@Deprecated
public void setAcceptorThreadCount(int threadCount) {
}
+
+ /**
+ * Always returns 1.
+ *
+ * @return Always 1.
+ *
+ * @Deprecated Will be removed in Tomcat 10.
+ */
@Deprecated
public int getAcceptorThreadCount() {
return 1;
diff --git a/java/org/apache/tomcat/util/net/AbstractEndpoint.java b/java/org/apache/tomcat/util/net/AbstractEndpoint.java
index a33e192..79d137e 100644
--- a/java/org/apache/tomcat/util/net/AbstractEndpoint.java
+++ b/java/org/apache/tomcat/util/net/AbstractEndpoint.java
@@ -406,8 +406,23 @@ public abstract class AbstractEndpoint<S,U> {
*/
protected int acceptorThreadCount = 1;
+ /**
+ * NO-OP.
+ *
+ * @param acceptorThreadCount Unused
+ *
+ * @Deprecated Will be removed in Tomcat 10.
+ */
@Deprecated
public void setAcceptorThreadCount(int acceptorThreadCount) {}
+
+ /**
+ * Always returns 1.
+ *
+ * @return Always 1.
+ *
+ * @Deprecated Will be removed in Tomcat 10.
+ */
@Deprecated
public int getAcceptorThreadCount() { return 1; }
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org