Author: markt
Date: Wed Nov 25 13:37:19 2015
New Revision: 1716402
URL: http://svn.apache.org/viewvc?rev=1716402&view=rev
Log:
Make the test play nicely with Java 6.
Modified:
tomcat/tc7.0.x/trunk/test/org/apache/tomcat/websocket/server/TestWsRemoteEndpointImplServer.java
Modified:
tomcat/tc7.0.x/trunk/test/org/apache/tomcat/websocket/server/TestWsRemoteEndpointImplServer.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/tomcat/websocket/server/TestWsRemoteEndpointImplServer.java?rev=1716402&r1=1716401&r2=1716402&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/test/org/apache/tomcat/websocket/server/TestWsRemoteEndpointImplServer.java
(original)
+++
tomcat/tc7.0.x/trunk/test/org/apache/tomcat/websocket/server/TestWsRemoteEndpointImplServer.java
Wed Nov 25 13:37:19 2015
@@ -16,7 +16,6 @@
*/
package org.apache.tomcat.websocket.server;
-import java.io.IOException;
import java.net.URI;
import java.util.ArrayList;
import java.util.List;
@@ -101,7 +100,7 @@ public class TestWsRemoteEndpointImplSer
ServerContainer sc = (ServerContainer)
sce.getServletContext().getAttribute(
Constants.SERVER_CONTAINER_SERVLET_CONTEXT_ATTRIBUTE);
- List<Class<? extends Encoder>> encoders = new ArrayList<>();
+ List<Class<? extends Encoder>> encoders = new ArrayList<Class<?
extends Encoder>>();
encoders.add(Bug58624Encoder.class);
ServerEndpointConfig sec = ServerEndpointConfig.Builder.create(
Bug58624Endpoint.class, PATH).encoders(encoders).build();
@@ -152,7 +151,7 @@ public class TestWsRemoteEndpointImplSer
try {
// Breakpoint B required on following line
session.getBasicRemote().sendObject("test");
- } catch (IOException | EncodeException e) {
+ } catch (Exception e) {
e.printStackTrace();
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
