[tomcat] 02/05: Collapse identical catch blocks

2020-12-04 Thread ebourg 
This is an automated email from the ASF dual-hosted git repository.

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

commit 22e89f8cde17dd62e1a5cf4365027da0de245145
Author: Emmanuel Bourg 
AuthorDate: Fri Dec 4 00:15:59 2020 +0100

Collapse identical catch blocks
---
 .../catalina/core/ApplicationDispatcher.java   |  4 +---
 .../catalina/core/NamingContextListener.java   |  2 --
 java/org/apache/catalina/core/StandardServer.java  |  4 +---
 .../org/apache/catalina/mbeans/ContainerMBean.java |  4 +---
 .../apache/catalina/servlets/WebdavServlet.java| 10 ++---
 .../org/apache/catalina/startup/ContextConfig.java | 25 +-
 .../group/interceptors/NonBlockingCoordinator.java |  4 +---
 .../tribes/tipis/AbstractReplicatedMap.java| 15 +++--
 .../apache/catalina/util/LifecycleMBeanBase.java   |  6 +-
 .../apache/catalina/valves/ErrorReportValve.java   |  4 +---
 java/org/apache/coyote/ajp/AjpProcessor.java   |  6 ++
 java/org/apache/el/parser/AstValue.java|  6 ++
 java/org/apache/jasper/compiler/JDTCompiler.java   |  5 ++---
 java/org/apache/jasper/servlet/JspServlet.java |  6 +-
 .../apache/jasper/servlet/JspServletWrapper.java   | 19 ++--
 .../dbcp/dbcp2/PoolableCallableStatement.java  |  4 +---
 .../dbcp2/datasources/InstanceKeyDataSource.java   | 10 ++---
 java/org/apache/tomcat/util/Diagnostics.java   |  8 ++-
 .../apache/catalina/core/TestAsyncContextImpl.java |  8 ++-
 .../catalina/valves/TestRequestFilterValve.java|  4 +---
 .../apache/coyote/http11/TestHttp11Processor.java  |  4 +---
 test/org/apache/el/TesterFunctions.java| 16 --
 test/org/apache/tomcat/util/net/TestCustomSsl.java | 11 +++---
 23 files changed, 41 insertions(+), 144 deletions(-)

diff --git a/java/org/apache/catalina/core/ApplicationDispatcher.java 
b/java/org/apache/catalina/core/ApplicationDispatcher.java
index 1eb66a6..052bd84 100644
--- a/java/org/apache/catalina/core/ApplicationDispatcher.java
+++ b/java/org/apache/catalina/core/ApplicationDispatcher.java
@@ -415,9 +415,7 @@ final class ApplicationDispatcher implements 
AsyncDispatcher, RequestDispatcher
 try {
 ServletOutputStream stream = response.getOutputStream();
 stream.close();
-} catch (IllegalStateException f) {
-// Ignore
-} catch (IOException f) {
+} catch (IllegalStateException | IOException f) {
 // Ignore
 }
 } catch (IOException e) {
diff --git a/java/org/apache/catalina/core/NamingContextListener.java 
b/java/org/apache/catalina/core/NamingContextListener.java
index 234492b..8616587 100644
--- a/java/org/apache/catalina/core/NamingContextListener.java
+++ b/java/org/apache/catalina/core/NamingContextListener.java
@@ -770,8 +770,6 @@ public class NamingContextListener
 "naming.invalidEnvEntryType", env.getName()));
 }
 }
-} catch (NumberFormatException e) {
-log.error(sm.getString("naming.invalidEnvEntryValue", 
env.getName()));
 } catch (IllegalArgumentException e) {
 log.error(sm.getString("naming.invalidEnvEntryValue", 
env.getName()));
 }
diff --git a/java/org/apache/catalina/core/StandardServer.java 
b/java/org/apache/catalina/core/StandardServer.java
index 8746c6d..31ab25d 100644
--- a/java/org/apache/catalina/core/StandardServer.java
+++ b/java/org/apache/catalina/core/StandardServer.java
@@ -832,9 +832,7 @@ public final class StandardServer extends 
LifecycleMBeanBase implements Server {
 f.getName().endsWith(".jar")) {
 ExtensionValidator.addSystemResource(f);
 }
-} catch (URISyntaxException e) {
-// Ignore
-} catch (IOException e) {
+} catch (URISyntaxException | IOException e) {
 // Ignore
 }
 }
diff --git a/java/org/apache/catalina/mbeans/ContainerMBean.java 
b/java/org/apache/catalina/mbeans/ContainerMBean.java
index e8bc8c1..434c09d 100644
--- a/java/org/apache/catalina/mbeans/ContainerMBean.java
+++ b/java/org/apache/catalina/mbeans/ContainerMBean.java
@@ -128,9 +128,7 @@ public class ContainerMBean extends 
BaseCatalinaMBean {
 ObjectName oname;
 try {
 oname = new ObjectName(valveName);
-} catch (MalformedObjectNameException e) {
-throw new MBeanException(e);
-} catch (NullPointerException e) {
+} catch (MalformedObjectNameException | NullPointerException e) {
 throw

Re: [tomcat] 02/05: Collapse identical catch blocks

2020-12-04 Thread Emmanuel Bourg 
Le 04/12/2020 à 09:03, Mark Thomas a écrit :

>>  java/org/apache/el/parser/AstValue.java|  6 ++
> 
> This is generated code. The change will be undone the next time the
> source is regenerated. My preference is to leave generated code as-is
> but I don't think this needs to be reverted.

Thank you for the information, I didn't know.


>>  .../dbcp/dbcp2/PoolableCallableStatement.java  |  4 +---
>>  .../dbcp2/datasources/InstanceKeyDataSource.java   | 10 ++---
> 
> This code is forked from Commons DBCP2. Any changes increases the risk
> of future merges having conflicts that require manual resolution. Better
> to apply the clean-up upstream and then pick it up in the next merge.

This is a mistake, I tried to avoid touching DBCP but these changes went
through. I'll apply the changes in Commons.

Emmanuel Bourg

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

Re: [tomcat] 02/05: Collapse identical catch blocks

2020-12-04 Thread Mark Thomas 
On 04/12/2020 00:05, ebo...@apache.org wrote:



> commit d03a176f94b42564ac5f6f28b587ad0e483716e2
> Author: Emmanuel Bourg 
> AuthorDate: Fri Dec 4 00:15:59 2020 +0100
> 
> Collapse identical catch blocks



>  java/org/apache/el/parser/AstValue.java|  6 ++

This is generated code. The change will be undone the next time the
source is regenerated. My preference is to leave generated code as-is
but I don't think this needs to be reverted.

>  .../dbcp/dbcp2/PoolableCallableStatement.java  |  4 +---
>  .../dbcp2/datasources/InstanceKeyDataSource.java   | 10 ++---

This code is forked from Commons DBCP2. Any changes increases the risk
of future merges having conflicts that require manual resolution. Better
to apply the clean-up upstream and then pick it up in the next merge.

Mark

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

[tomcat] 02/05: Collapse identical catch blocks

2020-12-03 Thread ebourg 
This is an automated email from the ASF dual-hosted git repository.

ebourg pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git

commit d03a176f94b42564ac5f6f28b587ad0e483716e2
Author: Emmanuel Bourg 
AuthorDate: Fri Dec 4 00:15:59 2020 +0100

Collapse identical catch blocks
---
 .../catalina/core/ApplicationDispatcher.java   |  4 +---
 .../catalina/core/NamingContextListener.java   |  2 --
 java/org/apache/catalina/core/StandardServer.java  |  4 +---
 .../org/apache/catalina/mbeans/ContainerMBean.java |  4 +---
 .../apache/catalina/servlets/WebdavServlet.java| 10 ++---
 .../org/apache/catalina/startup/ContextConfig.java | 25 +-
 .../group/interceptors/NonBlockingCoordinator.java |  4 +---
 .../tribes/tipis/AbstractReplicatedMap.java| 15 +++--
 .../apache/catalina/util/LifecycleMBeanBase.java   |  6 +-
 .../apache/catalina/valves/ErrorReportValve.java   |  4 +---
 .../catalina/valves/JsonErrorReportValve.java  |  4 +---
 java/org/apache/coyote/ajp/AjpProcessor.java   |  6 ++
 java/org/apache/el/parser/AstValue.java|  6 ++
 java/org/apache/jasper/compiler/JDTCompiler.java   |  5 ++---
 java/org/apache/jasper/servlet/JspServlet.java |  6 +-
 .../apache/jasper/servlet/JspServletWrapper.java   | 19 ++--
 .../dbcp/dbcp2/PoolableCallableStatement.java  |  4 +---
 .../dbcp2/datasources/InstanceKeyDataSource.java   | 10 ++---
 java/org/apache/tomcat/util/Diagnostics.java   |  8 ++-
 .../apache/catalina/core/TestAsyncContextImpl.java |  8 ++-
 .../catalina/valves/TestRequestFilterValve.java|  4 +---
 .../apache/coyote/http11/TestHttp11Processor.java  |  4 +---
 test/org/apache/el/TesterFunctions.java| 16 --
 test/org/apache/tomcat/util/net/TestCustomSsl.java | 11 +++---
 24 files changed, 42 insertions(+), 147 deletions(-)

diff --git a/java/org/apache/catalina/core/ApplicationDispatcher.java 
b/java/org/apache/catalina/core/ApplicationDispatcher.java
index a718aa9..c83656b 100644
--- a/java/org/apache/catalina/core/ApplicationDispatcher.java
+++ b/java/org/apache/catalina/core/ApplicationDispatcher.java
@@ -394,9 +394,7 @@ final class ApplicationDispatcher implements 
AsyncDispatcher, RequestDispatcher
 try {
 ServletOutputStream stream = response.getOutputStream();
 stream.close();
-} catch (IllegalStateException f) {
-// Ignore
-} catch (IOException f) {
+} catch (IllegalStateException | IOException f) {
 // Ignore
 }
 } catch (IOException e) {
diff --git a/java/org/apache/catalina/core/NamingContextListener.java 
b/java/org/apache/catalina/core/NamingContextListener.java
index 5c825bb..b0a5009 100644
--- a/java/org/apache/catalina/core/NamingContextListener.java
+++ b/java/org/apache/catalina/core/NamingContextListener.java
@@ -749,8 +749,6 @@ public class NamingContextListener implements 
LifecycleListener, PropertyChangeL
 "naming.invalidEnvEntryType", env.getName()));
 }
 }
-} catch (NumberFormatException e) {
-log.error(sm.getString("naming.invalidEnvEntryValue", 
env.getName()));
 } catch (IllegalArgumentException e) {
 log.error(sm.getString("naming.invalidEnvEntryValue", 
env.getName()));
 }
diff --git a/java/org/apache/catalina/core/StandardServer.java 
b/java/org/apache/catalina/core/StandardServer.java
index 1ac8676..fa213f7 100644
--- a/java/org/apache/catalina/core/StandardServer.java
+++ b/java/org/apache/catalina/core/StandardServer.java
@@ -1031,9 +1031,7 @@ public final class StandardServer extends 
LifecycleMBeanBase implements Server {
 f.getName().endsWith(".jar")) {
 ExtensionValidator.addSystemResource(f);
 }
-} catch (URISyntaxException e) {
-// Ignore
-} catch (IOException e) {
+} catch (URISyntaxException | IOException e) {
 // Ignore
 }
 }
diff --git a/java/org/apache/catalina/mbeans/ContainerMBean.java 
b/java/org/apache/catalina/mbeans/ContainerMBean.java
index e8bc8c1..434c09d 100644
--- a/java/org/apache/catalina/mbeans/ContainerMBean.java
+++ b/java/org/apache/catalina/mbeans/ContainerMBean.java
@@ -128,9 +128,7 @@ public class ContainerMBean extends 
BaseCatalinaMBean {
 ObjectName oname;
 try {
 oname = new ObjectName(valveName);
-} catch (MalformedObjectNameException e) {
-throw new MBeanException(e);
-} catch