Author: markt
Date: Sun Mar 10 11:55:41 2013
New Revision: 1454839
URL: http://svn.apache.org/r1454839
Log:
Fix failing unit tests
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsServerContainer.java
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsServerContainer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/server/WsServerContainer.java?rev=1454839&r1=1454838&r2=1454839&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/websocket/server/WsServerContainer.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/server/WsServerContainer.java
Sun Mar 10 11:55:41 2013
@@ -212,14 +212,19 @@ public class WsServerContainer extends W
pojo.getAnnotation(ServerEndpoint.class);
PojoMethodMapping methodMapping = pojoMethodMap.get(pojo);
if (methodMapping != null) {
- Configurator configurator;
- try {
- configurator = annotation.configurator().newInstance();
- } catch (InstantiationException | IllegalAccessException e) {
- throw new IllegalStateException(sm.getString(
- "serverContainer.configuratorFail",
- annotation.configurator().getName(),
- pojo.getClass().getName()), e);
+ Class<? extends Configurator> configuratorClazz =
+ annotation.configurator();
+ Configurator configurator = null;
+ if (!configuratorClazz.equals(Configurator.class)) {
+ try {
+ configurator = annotation.configurator().newInstance();
+ } catch (InstantiationException |
+ IllegalAccessException e) {
+ throw new IllegalStateException(sm.getString(
+ "serverContainer.configuratorFail",
+ annotation.configurator().getName(),
+ pojo.getClass().getName()), e);
+ }
}
sec = ServerEndpointConfig.Builder.create(
pojo, methodMapping.getWsPath()).
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
