[tomcat] branch 8.5.x updated: Also skip interfaces reported via onStartup()

[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


The following commit(s) were added to refs/heads/8.5.x by this push:
     new cc78a85  Also skip interfaces reported via onStartup()
cc78a85 is described below

commit cc78a8565acfe760a4b8aa116603e801ecd88b70
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Fri Oct 4 17:22:54 2019 +0100

    Also skip interfaces reported via onStartup()
---
 java/org/apache/tomcat/websocket/server/WsSci.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/java/org/apache/tomcat/websocket/server/WsSci.java 
b/java/org/apache/tomcat/websocket/server/WsSci.java
index 88d2462..6f98f43 100644
--- a/java/org/apache/tomcat/websocket/server/WsSci.java
+++ b/java/org/apache/tomcat/websocket/server/WsSci.java
@@ -62,8 +62,9 @@ public class WsSci implements ServletContainerInitializer {
             for (Class<?> clazz : clazzes) {
                 int modifiers = clazz.getModifiers();
                 if (!Modifier.isPublic(modifiers) ||
-                        Modifier.isAbstract(modifiers)) {
-                    // Non-public or abstract - skip it.
+                        Modifier.isAbstract(modifiers) ||
+                        Modifier.isInterface(modifiers)) {
+                    // Non-public, abstract or interface - skip it.
                     continue;
                 }
                 // Protect against scanning the WebSocket API JARs


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