[tomcat] 03/04: Align with 9.0.x. Use ReflectiveOperationException

[markt]

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

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

commit 768d8133cf5a7183e93a7e9e1d9826d1bb432afe
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Tue Jan 7 15:10:45 2020 +0000

    Align with 9.0.x. Use ReflectiveOperationException
---
 java/javax/el/ExpressionFactory.java                           | 3 +--
 java/javax/el/StaticFieldELResolver.java                       | 3 +--
 java/javax/security/auth/message/config/AuthConfigFactory.java | 6 ++----
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/java/javax/el/ExpressionFactory.java 
b/java/javax/el/ExpressionFactory.java
index cc80a9e..9390170 100644
--- a/java/javax/el/ExpressionFactory.java
+++ b/java/javax/el/ExpressionFactory.java
@@ -179,8 +179,7 @@ public abstract class ExpressionFactory {
             Throwable cause = e.getCause();
             Util.handleThrowable(cause);
             throw new ELException(Util.message(null, 
"expressionFactory.cannotCreate", clazz.getName()), e);
-        } catch (InstantiationException | IllegalAccessException | 
IllegalArgumentException |
-                NoSuchMethodException e) {
+        } catch (ReflectiveOperationException | IllegalArgumentException e) {
             throw new ELException(Util.message(null, 
"expressionFactory.cannotCreate", clazz.getName()), e);
         }
 
diff --git a/java/javax/el/StaticFieldELResolver.java 
b/java/javax/el/StaticFieldELResolver.java
index beb20e8..d6a9027 100644
--- a/java/javax/el/StaticFieldELResolver.java
+++ b/java/javax/el/StaticFieldELResolver.java
@@ -107,8 +107,7 @@ public class StaticFieldELResolver extends ELResolver {
                     Throwable cause = e.getCause();
                     Util.handleThrowable(cause);
                     throw new ELException(cause);
-                } catch (IllegalArgumentException | IllegalAccessException |
-                        InstantiationException e) {
+                } catch (ReflectiveOperationException e) {
                     throw new ELException(e);
                 }
                 return result;
diff --git a/java/javax/security/auth/message/config/AuthConfigFactory.java 
b/java/javax/security/auth/message/config/AuthConfigFactory.java
index e883433..d98b2f2 100644
--- a/java/javax/security/auth/message/config/AuthConfigFactory.java
+++ b/java/javax/security/auth/message/config/AuthConfigFactory.java
@@ -16,7 +16,6 @@
  */
 package javax.security.auth.message.config;
 
-import java.lang.reflect.InvocationTargetException;
 import java.security.AccessController;
 import java.security.Permission;
 import java.security.PrivilegedAction;
@@ -67,9 +66,8 @@ public abstract class AuthConfigFactory {
                     factory = AccessController.doPrivileged(
                             new PrivilegedExceptionAction<AuthConfigFactory>() 
{
                         @Override
-                        public AuthConfigFactory run() throws 
ClassNotFoundException,
-                                InstantiationException, 
IllegalAccessException, IllegalArgumentException,
-                                InvocationTargetException, 
NoSuchMethodException, SecurityException {
+                        public AuthConfigFactory run() throws 
ReflectiveOperationException,
+                                IllegalArgumentException, SecurityException {
                             // Load this class with the same class loader as 
used for
                             // this class. Note that the Thread context class 
loader
                             // should not be used since that would trigger a 
memory leak


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