This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/main by this push: new e82789cc33 Simplify e82789cc33 is described below commit e82789cc33d85543e2ade92d633741c0e0c23da1 Author: Mark Thomas <ma...@apache.org> AuthorDate: Thu Apr 3 17:47:04 2025 +0100 Simplify --- java/org/apache/naming/factory/DataSourceLinkFactory.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/java/org/apache/naming/factory/DataSourceLinkFactory.java b/java/org/apache/naming/factory/DataSourceLinkFactory.java index 60e8bb6550..2a2b3e0e54 100644 --- a/java/org/apache/naming/factory/DataSourceLinkFactory.java +++ b/java/org/apache/naming/factory/DataSourceLinkFactory.java @@ -66,8 +66,7 @@ public class DataSourceLinkFactory extends ResourceLinkFactory { DataSourceHandler handler = new DataSourceHandler((DataSource) datasource, username, password); return Proxy.newProxyInstance(datasource.getClass().getClassLoader(), datasource.getClass().getInterfaces(), handler); - } catch (Exception x) { - Exception exception = x; + } catch (Exception exception) { if (exception instanceof InvocationTargetException) { Throwable cause = exception.getCause(); if (cause instanceof VirtualMachineError) { --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org