Author: markt
Date: Sun Mar 10 23:53:52 2013
New Revision: 1454962
URL: http://svn.apache.org/r1454962
Log:
Prevent errors if Jar scanning is a too keen
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsSci.java
Modified: tomcat/trunk/java/org/apache/tomcat/websocket/server/WsSci.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/server/WsSci.java?rev=1454962&r1=1454961&r2=1454962&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/websocket/server/WsSci.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/server/WsSci.java Sun Mar 10
23:53:52 2013
@@ -23,6 +23,7 @@ import javax.servlet.ServletContainerIni
import javax.servlet.ServletContext;
import javax.servlet.ServletException;
import javax.servlet.annotation.HandlesTypes;
+import javax.websocket.ContainerProvider;
import javax.websocket.DeploymentException;
import javax.websocket.Endpoint;
import javax.websocket.server.ServerApplicationConfig;
@@ -56,6 +57,11 @@ public class WsSci implements ServletCon
try {
for (Class<?> clazz : clazzes) {
+ // Protect against scanning the WebSocket API JARs
+ if (clazz.getPackage().getName().startsWith(
+ ContainerProvider.class.getPackage().getName())) {
+ continue;
+ }
if (ServerApplicationConfig.class.isAssignableFrom(clazz)) {
serverApplicationConfigs.add(
(ServerApplicationConfig) clazz.newInstance());
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
