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 2013/10/15 23:32:23 UTC
svn commit: r1532545 - in /tomcat/tc7.0.x/trunk: ./
webapps/examples/WEB-INF/classes/websocket/ExamplesConfig.java
Author: markt
Date: Tue Oct 15 21:32:23 2013
New Revision: 1532545
URL: http://svn.apache.org/r1532545
Log:
Fix Gump failures when the SCI scan finds too many classes.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/websocket/ExamplesConfig.java
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1532544
Modified: tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/websocket/ExamplesConfig.java
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/websocket/ExamplesConfig.java?rev=1532545&r1=1532544&r2=1532545&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/websocket/ExamplesConfig.java (original)
+++ tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/websocket/ExamplesConfig.java Tue Oct 15 21:32:23 2013
@@ -53,7 +53,14 @@ public class ExamplesConfig implements S
@Override
public Set<Class<?>> getAnnotatedEndpointClasses(Set<Class<?>> scanned) {
// Deploy all WebSocket endpoints defined by annotations in the examples
- // web application.
- return scanned;
+ // web application. Filter out all others to avoid issues when running
+ // tests on Gump
+ Set<Class<?>> results = new HashSet<Class<?>>();
+ for (Class<?> clazz : scanned) {
+ if (clazz.getPackage().getName().startsWith("websocket.")) {
+ results.add(clazz);
+ }
+ }
+ return results;
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org