subject:"\[tomcat\] branch 7.0.x updated\: Align with 8.5.x to ease back\-ports."

[tomcat] branch 7.0.x updated: Align with 8.5.x to ease back-ports

2020-08-24 Thread markt

This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/7.0.x by this push:
 new afdb5d7  Align with 8.5.x to ease back-ports
afdb5d7 is described below

commit afdb5d78999f0ebe9db3d2ee8b912c90f9cdfa24
Author: Mark Thomas 
AuthorDate: Mon Aug 24 09:56:14 2020 +0100

Align with 8.5.x to ease back-ports
---
 .../apache/jasper/servlet/JspCServletContext.java  | 91 ++
 1 file changed, 25 insertions(+), 66 deletions(-)

diff --git a/java/org/apache/jasper/servlet/JspCServletContext.java 
b/java/org/apache/jasper/servlet/JspCServletContext.java
index fc4dbb5..f3f0260 100644
--- a/java/org/apache/jasper/servlet/JspCServletContext.java
+++ b/java/org/apache/jasper/servlet/JspCServletContext.java
@@ -14,10 +14,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.jasper.servlet;
 
-
 import java.io.File;
 import java.io.InputStream;
 import java.io.PrintWriter;
@@ -73,8 +71,7 @@ public class JspCServletContext implements ServletContext {
 /**
  * Servlet context initialization parameters.
  */
-private final ConcurrentMap myParameters =
-new ConcurrentHashMap();
+private final ConcurrentMap myParameters = new 
ConcurrentHashMap();
 
 
 /**
@@ -102,6 +99,8 @@ public class JspCServletContext implements ServletContext {
  *
  * @param aLogWriter PrintWriter which is used for log() calls
  * @param aResourceBaseURL Resource base URL
+ * @param classLoader   Class loader for this {@link ServletContext}
+ * @throws JasperException Never thrown
  */
 public JspCServletContext(PrintWriter aLogWriter, URL aResourceBaseURL, 
ClassLoader classLoader)
 throws JasperException {
@@ -124,9 +123,7 @@ public class JspCServletContext implements ServletContext {
  */
 @Override
 public Object getAttribute(String name) {
-
-return (myAttributes.get(name));
-
+return myAttributes.get(name);
 }
 
 
@@ -135,9 +132,7 @@ public class JspCServletContext implements ServletContext {
  */
 @Override
 public Enumeration getAttributeNames() {
-
-return (myAttributes.keys());
-
+return myAttributes.keys();
 }
 
 
@@ -148,9 +143,7 @@ public class JspCServletContext implements ServletContext {
  */
 @Override
 public ServletContext getContext(String uripath) {
-
-return (null);
-
+return null;
 }
 
 
@@ -159,9 +152,7 @@ public class JspCServletContext implements ServletContext {
  */
 @Override
 public String getContextPath() {
-
-return (null);
-
+return null;
 }
 
 
@@ -191,9 +182,7 @@ public class JspCServletContext implements ServletContext {
  */
 @Override
 public int getMajorVersion() {
-
-return (3);
-
+return 3;
 }
 
 
@@ -204,9 +193,7 @@ public class JspCServletContext implements ServletContext {
  */
 @Override
 public String getMimeType(String file) {
-
-return (null);
-
+return null;
 }
 
 
@@ -215,9 +202,7 @@ public class JspCServletContext implements ServletContext {
  */
 @Override
 public int getMinorVersion() {
-
-return (0);
-
+return 0;
 }
 
 
@@ -228,9 +213,7 @@ public class JspCServletContext implements ServletContext {
  */
 @Override
 public RequestDispatcher getNamedDispatcher(String name) {
-
-return (null);
-
+return null;
 }
 
 
@@ -242,7 +225,6 @@ public class JspCServletContext implements ServletContext {
  */
 @Override
 public String getRealPath(String path) {
-
 if (!myResourceBaseURL.getProtocol().equals("file"))
 return null;
 if (!path.startsWith("/"))
@@ -264,9 +246,7 @@ public class JspCServletContext implements ServletContext {
  */
 @Override
 public RequestDispatcher getRequestDispatcher(String path) {
-
-return (null);
-
+return null;
 }
 
 
@@ -282,9 +262,10 @@ public class JspCServletContext implements ServletContext {
 @Override
 public URL getResource(String path) throws MalformedURLException {
 
-if (!path.startsWith("/"))
-throw new MalformedURLException("Path '" + path +
-"' does not start with '/'");
+if (!path.startsWith("/")) {
+throw new MalformedURLException("Path '" + path + "' does not 
start with '/'");
+}
+
 URL url = new URL(myResourceBaseURL, path.substring(1));
 InputStream is = null;
 try {
@@ -302,7 +283,6 @@ public class JspCServletContext implements ServletContext {
 }
 }
 return url;
-
 }
 
 
@@ -314,14 +294,12 @@ public class JspCServletContext implements Servlet

[tomcat] branch 7.0.x updated: Align with 8.5.x to ease back-ports

2020-08-24 Thread markt

This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/7.0.x by this push:
 new afdb5d7  Align with 8.5.x to ease back-ports
afdb5d7 is described below

commit afdb5d78999f0ebe9db3d2ee8b912c90f9cdfa24
Author: Mark Thomas 
AuthorDate: Mon Aug 24 09:56:14 2020 +0100

Align with 8.5.x to ease back-ports
---
 .../apache/jasper/servlet/JspCServletContext.java  | 91 ++
 1 file changed, 25 insertions(+), 66 deletions(-)

diff --git a/java/org/apache/jasper/servlet/JspCServletContext.java 
b/java/org/apache/jasper/servlet/JspCServletContext.java
index fc4dbb5..f3f0260 100644
--- a/java/org/apache/jasper/servlet/JspCServletContext.java
+++ b/java/org/apache/jasper/servlet/JspCServletContext.java
@@ -14,10 +14,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.jasper.servlet;
 
-
 import java.io.File;
 import java.io.InputStream;
 import java.io.PrintWriter;
@@ -73,8 +71,7 @@ public class JspCServletContext implements ServletContext {
 /**
  * Servlet context initialization parameters.
  */
-private final ConcurrentMap myParameters =
-new ConcurrentHashMap();
+private final ConcurrentMap myParameters = new 
ConcurrentHashMap();
 
 
 /**
@@ -102,6 +99,8 @@ public class JspCServletContext implements ServletContext {
  *
  * @param aLogWriter PrintWriter which is used for log() calls
  * @param aResourceBaseURL Resource base URL
+ * @param classLoader   Class loader for this {@link ServletContext}
+ * @throws JasperException Never thrown
  */
 public JspCServletContext(PrintWriter aLogWriter, URL aResourceBaseURL, 
ClassLoader classLoader)
 throws JasperException {
@@ -124,9 +123,7 @@ public class JspCServletContext implements ServletContext {
  */
 @Override
 public Object getAttribute(String name) {
-
-return (myAttributes.get(name));
-
+return myAttributes.get(name);
 }
 
 
@@ -135,9 +132,7 @@ public class JspCServletContext implements ServletContext {
  */
 @Override
 public Enumeration getAttributeNames() {
-
-return (myAttributes.keys());
-
+return myAttributes.keys();
 }
 
 
@@ -148,9 +143,7 @@ public class JspCServletContext implements ServletContext {
  */
 @Override
 public ServletContext getContext(String uripath) {
-
-return (null);
-
+return null;
 }
 
 
@@ -159,9 +152,7 @@ public class JspCServletContext implements ServletContext {
  */
 @Override
 public String getContextPath() {
-
-return (null);
-
+return null;
 }
 
 
@@ -191,9 +182,7 @@ public class JspCServletContext implements ServletContext {
  */
 @Override
 public int getMajorVersion() {
-
-return (3);
-
+return 3;
 }
 
 
@@ -204,9 +193,7 @@ public class JspCServletContext implements ServletContext {
  */
 @Override
 public String getMimeType(String file) {
-
-return (null);
-
+return null;
 }
 
 
@@ -215,9 +202,7 @@ public class JspCServletContext implements ServletContext {
  */
 @Override
 public int getMinorVersion() {
-
-return (0);
-
+return 0;
 }
 
 
@@ -228,9 +213,7 @@ public class JspCServletContext implements ServletContext {
  */
 @Override
 public RequestDispatcher getNamedDispatcher(String name) {
-
-return (null);
-
+return null;
 }
 
 
@@ -242,7 +225,6 @@ public class JspCServletContext implements ServletContext {
  */
 @Override
 public String getRealPath(String path) {
-
 if (!myResourceBaseURL.getProtocol().equals("file"))
 return null;
 if (!path.startsWith("/"))
@@ -264,9 +246,7 @@ public class JspCServletContext implements ServletContext {
  */
 @Override
 public RequestDispatcher getRequestDispatcher(String path) {
-
-return (null);
-
+return null;
 }
 
 
@@ -282,9 +262,10 @@ public class JspCServletContext implements ServletContext {
 @Override
 public URL getResource(String path) throws MalformedURLException {
 
-if (!path.startsWith("/"))
-throw new MalformedURLException("Path '" + path +
-"' does not start with '/'");
+if (!path.startsWith("/")) {
+throw new MalformedURLException("Path '" + path + "' does not 
start with '/'");
+}
+
 URL url = new URL(myResourceBaseURL, path.substring(1));
 InputStream is = null;
 try {
@@ -302,7 +283,6 @@ public class JspCServletContext implements ServletContext {
 }
 }
 return url;
-
 }
 
 
@@ -314,14 +294,12 @@ public class JspCServletContext implements Servlet

[tomcat] branch 7.0.x updated: Align with 8.5.x to ease back-ports

2020-08-24 Thread markt

This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/7.0.x by this push:
 new afdb5d7  Align with 8.5.x to ease back-ports
afdb5d7 is described below

commit afdb5d78999f0ebe9db3d2ee8b912c90f9cdfa24
Author: Mark Thomas 
AuthorDate: Mon Aug 24 09:56:14 2020 +0100

Align with 8.5.x to ease back-ports
---
 .../apache/jasper/servlet/JspCServletContext.java  | 91 ++
 1 file changed, 25 insertions(+), 66 deletions(-)

diff --git a/java/org/apache/jasper/servlet/JspCServletContext.java 
b/java/org/apache/jasper/servlet/JspCServletContext.java
index fc4dbb5..f3f0260 100644
--- a/java/org/apache/jasper/servlet/JspCServletContext.java
+++ b/java/org/apache/jasper/servlet/JspCServletContext.java
@@ -14,10 +14,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.jasper.servlet;
 
-
 import java.io.File;
 import java.io.InputStream;
 import java.io.PrintWriter;
@@ -73,8 +71,7 @@ public class JspCServletContext implements ServletContext {
 /**
  * Servlet context initialization parameters.
  */
-private final ConcurrentMap myParameters =
-new ConcurrentHashMap();
+private final ConcurrentMap myParameters = new 
ConcurrentHashMap();
 
 
 /**
@@ -102,6 +99,8 @@ public class JspCServletContext implements ServletContext {
  *
  * @param aLogWriter PrintWriter which is used for log() calls
  * @param aResourceBaseURL Resource base URL
+ * @param classLoader   Class loader for this {@link ServletContext}
+ * @throws JasperException Never thrown
  */
 public JspCServletContext(PrintWriter aLogWriter, URL aResourceBaseURL, 
ClassLoader classLoader)
 throws JasperException {
@@ -124,9 +123,7 @@ public class JspCServletContext implements ServletContext {
  */
 @Override
 public Object getAttribute(String name) {
-
-return (myAttributes.get(name));
-
+return myAttributes.get(name);
 }
 
 
@@ -135,9 +132,7 @@ public class JspCServletContext implements ServletContext {
  */
 @Override
 public Enumeration getAttributeNames() {
-
-return (myAttributes.keys());
-
+return myAttributes.keys();
 }
 
 
@@ -148,9 +143,7 @@ public class JspCServletContext implements ServletContext {
  */
 @Override
 public ServletContext getContext(String uripath) {
-
-return (null);
-
+return null;
 }
 
 
@@ -159,9 +152,7 @@ public class JspCServletContext implements ServletContext {
  */
 @Override
 public String getContextPath() {
-
-return (null);
-
+return null;
 }
 
 
@@ -191,9 +182,7 @@ public class JspCServletContext implements ServletContext {
  */
 @Override
 public int getMajorVersion() {
-
-return (3);
-
+return 3;
 }
 
 
@@ -204,9 +193,7 @@ public class JspCServletContext implements ServletContext {
  */
 @Override
 public String getMimeType(String file) {
-
-return (null);
-
+return null;
 }
 
 
@@ -215,9 +202,7 @@ public class JspCServletContext implements ServletContext {
  */
 @Override
 public int getMinorVersion() {
-
-return (0);
-
+return 0;
 }
 
 
@@ -228,9 +213,7 @@ public class JspCServletContext implements ServletContext {
  */
 @Override
 public RequestDispatcher getNamedDispatcher(String name) {
-
-return (null);
-
+return null;
 }
 
 
@@ -242,7 +225,6 @@ public class JspCServletContext implements ServletContext {
  */
 @Override
 public String getRealPath(String path) {
-
 if (!myResourceBaseURL.getProtocol().equals("file"))
 return null;
 if (!path.startsWith("/"))
@@ -264,9 +246,7 @@ public class JspCServletContext implements ServletContext {
  */
 @Override
 public RequestDispatcher getRequestDispatcher(String path) {
-
-return (null);
-
+return null;
 }
 
 
@@ -282,9 +262,10 @@ public class JspCServletContext implements ServletContext {
 @Override
 public URL getResource(String path) throws MalformedURLException {
 
-if (!path.startsWith("/"))
-throw new MalformedURLException("Path '" + path +
-"' does not start with '/'");
+if (!path.startsWith("/")) {
+throw new MalformedURLException("Path '" + path + "' does not 
start with '/'");
+}
+
 URL url = new URL(myResourceBaseURL, path.substring(1));
 InputStream is = null;
 try {
@@ -302,7 +283,6 @@ public class JspCServletContext implements ServletContext {
 }
 }
 return url;
-
 }
 
 
@@ -314,14 +294,12 @@ public class JspCServletContext implements Servlet

[tomcat] branch 7.0.x updated: Align with 8.5.x to ease back-ports

2020-08-24 Thread markt

This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/7.0.x by this push:
 new afdb5d7  Align with 8.5.x to ease back-ports
afdb5d7 is described below

commit afdb5d78999f0ebe9db3d2ee8b912c90f9cdfa24
Author: Mark Thomas 
AuthorDate: Mon Aug 24 09:56:14 2020 +0100

Align with 8.5.x to ease back-ports
---
 .../apache/jasper/servlet/JspCServletContext.java  | 91 ++
 1 file changed, 25 insertions(+), 66 deletions(-)

diff --git a/java/org/apache/jasper/servlet/JspCServletContext.java 
b/java/org/apache/jasper/servlet/JspCServletContext.java
index fc4dbb5..f3f0260 100644
--- a/java/org/apache/jasper/servlet/JspCServletContext.java
+++ b/java/org/apache/jasper/servlet/JspCServletContext.java
@@ -14,10 +14,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.jasper.servlet;
 
-
 import java.io.File;
 import java.io.InputStream;
 import java.io.PrintWriter;
@@ -73,8 +71,7 @@ public class JspCServletContext implements ServletContext {
 /**
  * Servlet context initialization parameters.
  */
-private final ConcurrentMap myParameters =
-new ConcurrentHashMap();
+private final ConcurrentMap myParameters = new 
ConcurrentHashMap();
 
 
 /**
@@ -102,6 +99,8 @@ public class JspCServletContext implements ServletContext {
  *
  * @param aLogWriter PrintWriter which is used for log() calls
  * @param aResourceBaseURL Resource base URL
+ * @param classLoader   Class loader for this {@link ServletContext}
+ * @throws JasperException Never thrown
  */
 public JspCServletContext(PrintWriter aLogWriter, URL aResourceBaseURL, 
ClassLoader classLoader)
 throws JasperException {
@@ -124,9 +123,7 @@ public class JspCServletContext implements ServletContext {
  */
 @Override
 public Object getAttribute(String name) {
-
-return (myAttributes.get(name));
-
+return myAttributes.get(name);
 }
 
 
@@ -135,9 +132,7 @@ public class JspCServletContext implements ServletContext {
  */
 @Override
 public Enumeration getAttributeNames() {
-
-return (myAttributes.keys());
-
+return myAttributes.keys();
 }
 
 
@@ -148,9 +143,7 @@ public class JspCServletContext implements ServletContext {
  */
 @Override
 public ServletContext getContext(String uripath) {
-
-return (null);
-
+return null;
 }
 
 
@@ -159,9 +152,7 @@ public class JspCServletContext implements ServletContext {
  */
 @Override
 public String getContextPath() {
-
-return (null);
-
+return null;
 }
 
 
@@ -191,9 +182,7 @@ public class JspCServletContext implements ServletContext {
  */
 @Override
 public int getMajorVersion() {
-
-return (3);
-
+return 3;
 }
 
 
@@ -204,9 +193,7 @@ public class JspCServletContext implements ServletContext {
  */
 @Override
 public String getMimeType(String file) {
-
-return (null);
-
+return null;
 }
 
 
@@ -215,9 +202,7 @@ public class JspCServletContext implements ServletContext {
  */
 @Override
 public int getMinorVersion() {
-
-return (0);
-
+return 0;
 }
 
 
@@ -228,9 +213,7 @@ public class JspCServletContext implements ServletContext {
  */
 @Override
 public RequestDispatcher getNamedDispatcher(String name) {
-
-return (null);
-
+return null;
 }
 
 
@@ -242,7 +225,6 @@ public class JspCServletContext implements ServletContext {
  */
 @Override
 public String getRealPath(String path) {
-
 if (!myResourceBaseURL.getProtocol().equals("file"))
 return null;
 if (!path.startsWith("/"))
@@ -264,9 +246,7 @@ public class JspCServletContext implements ServletContext {
  */
 @Override
 public RequestDispatcher getRequestDispatcher(String path) {
-
-return (null);
-
+return null;
 }
 
 
@@ -282,9 +262,10 @@ public class JspCServletContext implements ServletContext {
 @Override
 public URL getResource(String path) throws MalformedURLException {
 
-if (!path.startsWith("/"))
-throw new MalformedURLException("Path '" + path +
-"' does not start with '/'");
+if (!path.startsWith("/")) {
+throw new MalformedURLException("Path '" + path + "' does not 
start with '/'");
+}
+
 URL url = new URL(myResourceBaseURL, path.substring(1));
 InputStream is = null;
 try {
@@ -302,7 +283,6 @@ public class JspCServletContext implements ServletContext {
 }
 }
 return url;
-
 }
 
 
@@ -314,14 +294,12 @@ public class JspCServletContext implements Servlet

[tomcat] branch 7.0.x updated: Align with 8.5.x to ease back-ports

2020-08-24 Thread markt

This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/7.0.x by this push:
 new afdb5d7  Align with 8.5.x to ease back-ports
afdb5d7 is described below

commit afdb5d78999f0ebe9db3d2ee8b912c90f9cdfa24
Author: Mark Thomas 
AuthorDate: Mon Aug 24 09:56:14 2020 +0100

Align with 8.5.x to ease back-ports
---
 .../apache/jasper/servlet/JspCServletContext.java  | 91 ++
 1 file changed, 25 insertions(+), 66 deletions(-)

diff --git a/java/org/apache/jasper/servlet/JspCServletContext.java 
b/java/org/apache/jasper/servlet/JspCServletContext.java
index fc4dbb5..f3f0260 100644
--- a/java/org/apache/jasper/servlet/JspCServletContext.java
+++ b/java/org/apache/jasper/servlet/JspCServletContext.java
@@ -14,10 +14,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.jasper.servlet;
 
-
 import java.io.File;
 import java.io.InputStream;
 import java.io.PrintWriter;
@@ -73,8 +71,7 @@ public class JspCServletContext implements ServletContext {
 /**
  * Servlet context initialization parameters.
  */
-private final ConcurrentMap myParameters =
-new ConcurrentHashMap();
+private final ConcurrentMap myParameters = new 
ConcurrentHashMap();
 
 
 /**
@@ -102,6 +99,8 @@ public class JspCServletContext implements ServletContext {
  *
  * @param aLogWriter PrintWriter which is used for log() calls
  * @param aResourceBaseURL Resource base URL
+ * @param classLoader   Class loader for this {@link ServletContext}
+ * @throws JasperException Never thrown
  */
 public JspCServletContext(PrintWriter aLogWriter, URL aResourceBaseURL, 
ClassLoader classLoader)
 throws JasperException {
@@ -124,9 +123,7 @@ public class JspCServletContext implements ServletContext {
  */
 @Override
 public Object getAttribute(String name) {
-
-return (myAttributes.get(name));
-
+return myAttributes.get(name);
 }
 
 
@@ -135,9 +132,7 @@ public class JspCServletContext implements ServletContext {
  */
 @Override
 public Enumeration getAttributeNames() {
-
-return (myAttributes.keys());
-
+return myAttributes.keys();
 }
 
 
@@ -148,9 +143,7 @@ public class JspCServletContext implements ServletContext {
  */
 @Override
 public ServletContext getContext(String uripath) {
-
-return (null);
-
+return null;
 }
 
 
@@ -159,9 +152,7 @@ public class JspCServletContext implements ServletContext {
  */
 @Override
 public String getContextPath() {
-
-return (null);
-
+return null;
 }
 
 
@@ -191,9 +182,7 @@ public class JspCServletContext implements ServletContext {
  */
 @Override
 public int getMajorVersion() {
-
-return (3);
-
+return 3;
 }
 
 
@@ -204,9 +193,7 @@ public class JspCServletContext implements ServletContext {
  */
 @Override
 public String getMimeType(String file) {
-
-return (null);
-
+return null;
 }
 
 
@@ -215,9 +202,7 @@ public class JspCServletContext implements ServletContext {
  */
 @Override
 public int getMinorVersion() {
-
-return (0);
-
+return 0;
 }
 
 
@@ -228,9 +213,7 @@ public class JspCServletContext implements ServletContext {
  */
 @Override
 public RequestDispatcher getNamedDispatcher(String name) {
-
-return (null);
-
+return null;
 }
 
 
@@ -242,7 +225,6 @@ public class JspCServletContext implements ServletContext {
  */
 @Override
 public String getRealPath(String path) {
-
 if (!myResourceBaseURL.getProtocol().equals("file"))
 return null;
 if (!path.startsWith("/"))
@@ -264,9 +246,7 @@ public class JspCServletContext implements ServletContext {
  */
 @Override
 public RequestDispatcher getRequestDispatcher(String path) {
-
-return (null);
-
+return null;
 }
 
 
@@ -282,9 +262,10 @@ public class JspCServletContext implements ServletContext {
 @Override
 public URL getResource(String path) throws MalformedURLException {
 
-if (!path.startsWith("/"))
-throw new MalformedURLException("Path '" + path +
-"' does not start with '/'");
+if (!path.startsWith("/")) {
+throw new MalformedURLException("Path '" + path + "' does not 
start with '/'");
+}
+
 URL url = new URL(myResourceBaseURL, path.substring(1));
 InputStream is = null;
 try {
@@ -302,7 +283,6 @@ public class JspCServletContext implements ServletContext {
 }
 }
 return url;
-
 }
 
 
@@ -314,14 +294,12 @@ public class JspCServletContext implements Servlet

[tomcat] branch 7.0.x updated: Align with 8.5.x to ease back-ports.

2019-10-11 Thread markt

This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/7.0.x by this push:
 new e68d6f8  Align with 8.5.x to ease back-ports.
e68d6f8 is described below

commit e68d6f83e550531591bf41a172fb36fdd3393029
Author: Mark Thomas 
AuthorDate: Fri Oct 11 13:25:01 2019 +0100

Align with 8.5.x to ease back-ports.
---
 java/org/apache/coyote/AsyncStateMachine.java | 10 ++
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/java/org/apache/coyote/AsyncStateMachine.java 
b/java/org/apache/coyote/AsyncStateMachine.java
index d4df0ff..0c1bcec 100644
--- a/java/org/apache/coyote/AsyncStateMachine.java
+++ b/java/org/apache/coyote/AsyncStateMachine.java
@@ -132,8 +132,7 @@ public class AsyncStateMachine {
 /**
  * The string manager for this package.
  */
-private static final StringManager sm =
-StringManager.getManager(Constants.Package);
+private static final StringManager sm = 
StringManager.getManager(AsyncStateMachine.class);
 
 private enum AsyncState {
 DISPATCHED  (false, false, false, false),
@@ -241,11 +240,7 @@ public class AsyncStateMachine {
 } else  if (state == AsyncState.STARTING) {
 state = AsyncState.STARTED;
 return SocketState.LONG;
-} else if (state == AsyncState.MUST_COMPLETE) {
-asyncCtxt.fireOnComplete();
-state = AsyncState.DISPATCHED;
-return SocketState.ASYNC_END;
-} else if (state == AsyncState.COMPLETING) {
+} else if (state == AsyncState.MUST_COMPLETE || state == 
AsyncState.COMPLETING) {
 asyncCtxt.fireOnComplete();
 state = AsyncState.DISPATCHED;
 return SocketState.ASYNC_END;
@@ -297,7 +292,6 @@ public class AsyncStateMachine {
 throw new IllegalStateException(
 sm.getString("asyncStateMachine.invalidAsyncState",
 "asyncComplete()", state));
-
 }
 return triggerDispatch;
 }


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[tomcat] branch 7.0.x updated: Align with 8.5.x to ease back-ports

[tomcat] branch 7.0.x updated: Align with 8.5.x to ease back-ports

[tomcat] branch 7.0.x updated: Align with 8.5.x to ease back-ports

[tomcat] branch 7.0.x updated: Align with 8.5.x to ease back-ports

[tomcat] branch 7.0.x updated: Align with 8.5.x to ease back-ports

[tomcat] branch 7.0.x updated: Align with 8.5.x to ease back-ports.

6 matches

Site Navigation

Mail list logo

Footer information