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/06/30 21:24:47 UTC
[tomcat] 01/02: Align with 9.0.x. Remove unnecessary code.
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 a964820899e87271d3d4e7466adbd63def31af86
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Sun Jun 30 22:24:05 2019 +0100
Align with 9.0.x. Remove unnecessary code.
---
java/org/apache/tomcat/websocket/pojo/PojoEndpointBase.java | 3 ---
java/org/apache/tomcat/websocket/pojo/PojoMethodMapping.java | 4 ++--
2 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/java/org/apache/tomcat/websocket/pojo/PojoEndpointBase.java b/java/org/apache/tomcat/websocket/pojo/PojoEndpointBase.java
index 5459504..75615d4 100644
--- a/java/org/apache/tomcat/websocket/pojo/PojoEndpointBase.java
+++ b/java/org/apache/tomcat/websocket/pojo/PojoEndpointBase.java
@@ -72,14 +72,11 @@ public abstract class PojoEndpointBase extends Endpoint {
"pojoEndpointBase.onOpenFail",
pojo.getClass().getName()), e);
handleOnOpenOrCloseError(session, e);
- return;
} catch (InvocationTargetException e) {
Throwable cause = e.getCause();
handleOnOpenOrCloseError(session, cause);
- return;
} catch (Throwable t) {
handleOnOpenOrCloseError(session, t);
- return;
}
}
}
diff --git a/java/org/apache/tomcat/websocket/pojo/PojoMethodMapping.java b/java/org/apache/tomcat/websocket/pojo/PojoMethodMapping.java
index 39efdc0..d640b53 100644
--- a/java/org/apache/tomcat/websocket/pojo/PojoMethodMapping.java
+++ b/java/org/apache/tomcat/websocket/pojo/PojoMethodMapping.java
@@ -204,9 +204,9 @@ public class PojoMethodMapping {
private boolean isMethodOverride(Method method1, Method method2) {
- return (method1.getName().equals(method2.getName())
+ return method1.getName().equals(method2.getName())
&& method1.getReturnType().equals(method2.getReturnType())
- && Arrays.equals(method1.getParameterTypes(), method2.getParameterTypes()));
+ && Arrays.equals(method1.getParameterTypes(), method2.getParameterTypes());
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org